diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 6d3100bd..9237ea7f 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -48,30 +48,14 @@ namespace Pinetime {
       struct WatchFaceInfineat {
         bool showSideCover = true;
         bool showAlarmStatus = true;
-<<<<<<< HEAD
 	int colorIndex = 0;
       };
  
-      struct WatchFaceInfineatColors {
-        bool showSideCover = true;
-=======
->>>>>>> 70f9025f (now I have the Meow Watchface AND the Infineat Watchface with alarm display)
-        int colorIndex = 0;
-      };
-<<<<<<< HEAD
-           
-=======
-
->>>>>>> 9d04c32f (recovering manually changes to original Infineat)
       struct WatchFaceMeow {
         bool showSideCover = true;
         int colorIndex = 0;
       };
-<<<<<<< HEAD
- 
-=======
-
->>>>>>> 9d04c32f (recovering manually changes to original Infineat)
+      
       Settings(Pinetime::Controllers::FS& fs);
 
       Settings(const Settings&) = delete;
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
index e0a80200..7f4d03fc 100644
--- a/src/displayapp/apps/Apps.h.in
+++ b/src/displayapp/apps/Apps.h.in
@@ -52,10 +52,6 @@ namespace Pinetime {
       PineTimeStyle,
       Terminal,
       Infineat,
-<<<<<<< HEAD
-      InfineatColors,
-=======
->>>>>>> 504f5774 (copy :( files from gitlab repo)
       Meow,
       CasioStyleG7710,
     };