diff --git a/bash/mount_whitehorse.command b/bash/mount_whitehorse_old.command
similarity index 86%
rename from bash/mount_whitehorse.command
rename to bash/mount_whitehorse_old.command
index f14e80f..60c41f0 100755
--- a/bash/mount_whitehorse.command
+++ b/bash/mount_whitehorse_old.command
@@ -10,7 +10,11 @@ mkdir /Volumes/whitehorse
 mount -t smbfs //mak:ale2312x@makineisilon/whitehorse /Volumes/whitehorse
 echo mounting pegasus
 mkdir /Volumes/pegasus
+<<<<<<< HEAD
 mount -t smbfs //eduardo:"pgss%401046"@mak-nas/pegasus /Volumes/pegasus
+=======
+mount -t smbfs //jorge:Ladilla3@mak-nas/pegasus /Volumes/pegasus
+>>>>>>> dee053f9f1adf232abbf990e89d87ba750dc970e
 echo done.
 sleep 1
 open -a trolCommander
@@ -24,8 +28,11 @@ echo '| $$      | $$  | $$| $$\  $$$| $$    $$| $$  | $$        | $$  | $$\  $$$
 echo '| $$      |  $$$$$$/| $$ \  $$|  $$$$$$/| $$  | $$       /$$$$$$| $$ \  $$';
 echo '|__/       \______/ |__/  \__/ \______/ |__/  |__/      |______/|__/  \__/';
 
+<<<<<<< HEAD
 log_punch.sh in
 
+=======
+>>>>>>> dee053f9f1adf232abbf990e89d87ba750dc970e
 sleep 25
 
 "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" https://timeandlabor.paychex.com/secure/Login.aspx?Alias=0083A8306102 --args --"profile-direory"="Profile 2" > /tmp/chromelog.log &