diff --git a/apps/smclock/ChangeLog b/apps/smclock/ChangeLog
index b09db0145..0300d5ceb 100644
--- a/apps/smclock/ChangeLog
+++ b/apps/smclock/ChangeLog
@@ -1,8 +1,4 @@
 0.01: Initial version
 0.02: Add battery level
-<<<<<<< HEAD
-0.03: fix battery level displaying
-=======
 0.03: Fix battery display when full
 0.04: Add support for settings
->>>>>>> feature/introduce_settings
diff --git a/apps/smclock/metadata.json b/apps/smclock/metadata.json
index 5918406d6..cc995d587 100644
--- a/apps/smclock/metadata.json
+++ b/apps/smclock/metadata.json
@@ -1,23 +1,10 @@
 {
-<<<<<<< HEAD
-  "id":"smclock",
-  "name":"Monogram Watch Face",
-  "shortName":"MonoClock",
-  "icon":"app.png",
-<<<<<<< HEAD
-  "version":"0.03",
-=======
-  "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.02",
->>>>>>> 29432bb9 (Add screenshot)
-=======
   "id": "smclock",
   "name": "Monogram Watch Face",
   "shortName": "MonoClock",
   "icon": "app.png",
   "screenshots": [{ "url": "screenshot.png" }],
   "version": "0.04",
->>>>>>> feature/introduce_settings
   "description": "A simple watchface based on my stylised monogram.",
   "type": "clock",
   "tags": "clock",