diff --git a/.gitignore b/.gitignore
index f14a8a8..32167d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@ todo_stack
 getReady.sh
 base_type.c
 sample
+<<<<<<< HEAD
 compile
+=======
+>>>>>>> refs/remotes/master/master