diff --git a/Makefile b/Makefile
index 4f6a493..68c7a04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 setup:
 	mkdir build
-<<<<<<< HEAD
+
 sheet0:
 	g++ src/sheet0.cpp -o ./build/sheet0
 	chmod +x build/sheet0