diff --git a/home/.bash_env b/home/.bash_env
index 91f4d2a..6b3821c 100644
--- a/home/.bash_env
+++ b/home/.bash_env
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 export GOPATH=~/build/go
 
 source $HOME/.cargo/env
@@ -9,8 +8,7 @@ fi
 
 if [ -d $GOPATH/bin ]; then
 	export PATH=$GOPATH/bin:$PATH
-=======
-export PATH=~/bin/scripts:~/bin:/usr/local/bin:$PATH
+fi
 
 # We are on a Macports system
 if [ -d /opt/local ]; then
@@ -25,7 +23,6 @@ if [ "$(id -u)" -eq "0" ]; then
 	fi
 
 	export PATH=/usr/local/sbin:$PATH
->>>>>>> f2eb8b201305d0dc745297c82466df103afbcc76
 fi
 
 # OS X stuff if availabe