diff --git a/script/dev-env.sh b/script/dev-env.sh
index 71fbd208f..15f08e2e1 100755
--- a/script/dev-env.sh
+++ b/script/dev-env.sh
@@ -6,7 +6,6 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
 PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 
-<<<<<<< HEAD
 export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
 export AWS_DEFAULT_REGION='garage'