diff --git a/hosting/.env b/hosting/.env
index 162f742eb..ab9893f33 100644
--- a/hosting/.env
+++ b/hosting/.env
@@ -22,8 +22,4 @@ BUDIBASE_ENVIRONMENT=PRODUCTION
 
 # An admin user can be automatically created initially if these are set
 BB_ADMIN_USER_EMAIL=
-<<<<<<< HEAD
 BB_ADMIN_USER_PASSWORD=
-=======
-BB_ADMIN_USER_PASSWORD=
->>>>>>> parent of c95571151 (update)