diff --git a/.gitmodules b/.gitmodules
index 5afcf25..4a108bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,9 @@
 [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
new file mode 160000
index 0000000..90ee6fb
--- /dev/null
+++ b/vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 90ee6fb5d255d14d9f12f2469f92ee50149f5b44