diff --git a/.gitignore b/.gitignore
index f778d633..d6df654a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,4 @@
 log_*
 log.*
 *~
-<<<<<<< HEAD
-
-linux64Gcc*
-lnInclude
-=======
 **/linux64GccDPInt32Opt
->>>>>>> b8921ec6ca10719a4aa4990fcbaf730076fb67fd