diff --git a/.gitignore b/.gitignore
index fd0b526..61ff533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ignore debug
 out/
 build/