diff --git a/.gitignore b/.gitignore
index e7eb8cd0..c40b6f34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,6 @@ sources_non_forked/ack.vim/.netrwhist
 temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
-<<<<<<< HEAD
-=======
 sources_non_forked/ctrlp.vim/doc/tags*
-my_configs.vim
->>>>>>> 2644909e1e6273e4317a077ef289833e7500be53
 tags
-.DS_Store
\ No newline at end of file
+.DS_Store