diff --git a/.gitignore b/.gitignore
index c1d3d33576..924a93e807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,5 @@ tex/*/out
 perf.data
 perf.data.old
 flamegraph.svg
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
 tests/extern-so/libtestlib.so
-=======
->>>>>>> master
->>>>>>> 58ba05a0 (C FFI support for functions with int args and returns)
 .auto-*