diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 57b2c5e..6b215b2 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -124,7 +124,6 @@ kcrypt:
 			})
 
 			It("replaces the file contents", func() {
-<<<<<<< HEAD
 				err := c.SetMapping("COS_PERSISTENT:the_new_name:the_new_uuid")
 				Expect(err).ToNot(HaveOccurred())
 				err = c.WriteMappings(tmpFile.Name())