diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1 @@
+Makefile
diff --git a/.gitignore b/.gitignore
index 04a41a2..98a86c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+Makefile
 **.pyc
diff --git a/Makefile b/Makefile
index 97f4837..766f5de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
+<<<<<<< HEAD
 home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
+=======
+home_symlinks = vimrc vim bash_profile
+>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
 
 config_copy = 
 
@@ -9,7 +13,11 @@ config_symlinks =
 
 all: install
 
+<<<<<<< HEAD
 install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
+=======
+install: vimrc vim bash_profile
+>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
 
 .PHONY: $(home_symlinks)
 $(home_symlinks):