diff --git a/entrypoint.sh b/entrypoint.sh
index 23310b2..5058133 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,11 +4,7 @@ set -e
 
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
-<<<<<<< HEAD
     set -- gerbil "$@"
-=======
-    set -- newt "$@"
->>>>>>> env-vars
 fi
 
 exec "$@"
\ No newline at end of file