diff --git a/appveyor.yml b/appveyor.yml
index 449f5ae986..9efa153e3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,13 +8,6 @@ branches:
     - vs2015
 
 cache:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    - node_modules
->>>>>>> Start work on setting up CO testing on windows with AppVeyor
-=======
->>>>>>> Add AppVeyor badge
     - .build-cache
 
 environment: