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