diff --git a/src/workspaces.c b/src/workspaces.c
index ddb6c2bd..0edd1b36 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -25,11 +25,6 @@
 #include "theme.h"
 #include "view.h"
 
-<<<<<<< master
-
-#define COSMIC_WORKSPACES_VERSION 1
-=======
->>>>>>> master
 #define EXT_WORKSPACES_VERSION 1
 
 /* Internal helpers */