diff --git a/saves/workout/history.json b/saves/workout/history.json
index 050053307f..f5058b1cc2 100644
--- a/saves/workout/history.json
+++ b/saves/workout/history.json
@@ -114,5 +114,34 @@
         "nano": 877009100
       }
     }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/4.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 20,
+        "minute": 53,
+        "second": 17,
+        "nano": 920083000
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 20,
+        "minute": 53,
+        "second": 17,
+        "nano": 920083000
+      }
+    }
   }
 ]
\ No newline at end of file
diff --git a/saves/workout/workoutSession/4.json b/saves/workout/workoutSession/4.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 87951d1f23..a54719dd8e 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-Hi, this is the Schwarzenegger, an app for your daily workout and diet recording.
+Greetings from Schwarzenegger!
 Bye, you have exited the Schwarzenegger.
-=======
-Which session do you want to enter?
-back
->>>>>>> b59ba0db7cde4b96765c094470485da808828304