diff --git a/config.sh b/config.sh
index 714081b..7e859ec 100755
--- a/config.sh
+++ b/config.sh
@@ -7,9 +7,13 @@ rm -f .bashrc
 ln -s ~/Repositories/config/profile .profile
 ln -s ~/Repositories/config/bashrc .bashrc
 
-rm -f .screenrf
+rm -f .screenrc
 ln -s ~/Repositories/config/screenrc .screenrc
 
 rm -f .vimrc
 ln -s ~/Repositories/config/vimrc .vimrc
 
+# set up the default branch for git
+git config --global branch.master.remote origin
+git config --global branch.master.merge refs/heads/master
+
diff --git a/profile b/profile
index fbc6117..093a550 100644
--- a/profile
+++ b/profile
@@ -42,7 +42,12 @@ export HISTCONTROL=ignoredups
 # disable messaging
 mesg n
 
+<<<<<<< HEAD
 # set the path for Hadoop
 export HADOOP_HOME=~/hadoop/hadoop-0.20.2/
 export PATH=$PATH:$HADOOP_HOME/bin
+=======
+# add the rubygem location
+export PATH=$PATH:/var/lib/gems/1.8/bin/ 
+>>>>>>> 6fd6398cec6e7bef7c00bef10fdc4ee45a615301