diff --git a/.eslintrc.json b/.eslintrc.json
index 3fbab2d13..0e2fd4952 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -125,10 +125,7 @@
     "Checklists": true,
     "Settings": true,
     "InvitationCodes": true,
-<<<<<<< HEAD
     "Winston":true
-=======
     "JsonRoutes" : true
->>>>>>> 3a5150f6eef86816471f7b0134d3d93cf6686413
   }
 }