diff --git a/Makefile b/Makefile
index a0d6607..e40ec5b 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,6 @@ endif
 
 # operator-sdk
 OPERATOR_SDK_CLI ?= operator-sdk
-<<<<<<< HEAD
-=======
-
->>>>>>> 682f891 (v0.2.0 (#63))
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # This is a requirement for 'setup-envtest.sh' in the test target.