diff --git a/.gitmodules b/.gitmodules
index 4a108bc..5afcf25 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,3 @@
 [submodule "vim/bundle/bufexplorer"]
 	path = vim/bundle/bufexplorer
 	url = git@github.com:jlanzarotta/bufexplorer.git
-<<<<<<< HEAD
-=======
-[submodule "vim/bundle/vim-fugitive"]
-	path = vim/bundle/vim-fugitive
-	url = git@github.com:tpope/vim-fugitive
->>>>>>> 20b22f221bbd693fed9797f0d13ae6a2ce168716
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
deleted file mode 160000
index 90ee6fb..0000000
--- a/vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90ee6fb5d255d14d9f12f2469f92ee50149f5b44