diff --git a/scripts/install b/scripts/install
index dad7f1e71acd43b05f91d1c3e7f4e6a40a62f83c..d4d22a8c4f6d59ca3aef0f8999c9ba5e7ba1ddb7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,20 +9,14 @@ echo "DISCOURSE_DB_PASSWORD=${PG_PASSWORD}" >> .env
 echo "POSTGRES_PASSWORD=${PG_PASSWORD}" >> .env
 echo "SUBNET=${SUBNET:-0}" >> .env
 echo "POSTGRES_VERSION=10.6" >> .env
-<<<<<<< HEAD
-echo "DISCOURSE_VERSION=2.2.0.beta4" >> .env
-=======
->>>>>>> e83fe36008d2cc24348b4b2e5aa79f8929507a4b
+echo "DISCOURSE_VERSION=2.3.2019060301" >> .env
 
 mkdir -p ./data/{assets,uploads,backups,redis,postgres}
 
 chown -R 1000:1000 ./data/
 
 VIRTUAL_HOST=${URL} docker-compose run app bash -c "sleep 60 && bundle exec rake maxminddb:get db:migrate assets:precompile"
-<<<<<<< HEAD
 VIRTUAL_HOST=${URL} docker-compose run app bash -c "bundle exec rake admin:create"
-=======
-VIRTUAL_HOST=${URL} docker-compose run app bash -c "rake admin:create"
->>>>>>> e83fe36008d2cc24348b4b2e5aa79f8929507a4b
+
 
 echo "!!!Configure notification email in discourse settings!!!!!!"