diff --git a/.gitignore b/.gitignore
index b909155..16bcb8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,9 +32,6 @@
 
 # ignore IDE files
 .idea/*
-<<<<<<< HEAD
-=======
 
 # ignore yard doc files
 .yardoc/*
->>>>>>> 97cb77ae9aa380ac8352b49ae90b0c118aa9d2a2