diff --git a/conf/.env b/conf/.env
index 1a89f79..475811b 100644
--- a/conf/.env
+++ b/conf/.env
@@ -3,12 +3,9 @@ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__
 
 OCIS_URL=https://__DOMAIN__
 PROXY_HTTP_ADDR=127.0.0.1:__PORT__
-PROXY_TLS=true
+PROXY_TLS=false
 OCIS_INSECURE=false
 
-#OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem"
-#OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem"
-
 OCIS_LOG_LEVEL=warn
 
 OCIS_FORCE_CONFIG_OVERWRITE=true
@@ -17,23 +14,6 @@ OCIS_CONFIG_DIR=__INSTALL_DIR__
 OCIS_BASE_DATA_PATH=__DATA_DIR__
 OCIS_CORS_ALLOW_ORIGINS=[*]
 
-<<<<<<< Updated upstream
-
-IDM_ADMIN_PASSWORD=__PASSWORD__
-
-
-OCIS_DEFAULT_LANGUAGE=__LANGUAGE__
-
-#AUTH_BASIC_AUTH_MANAGER=ldap
-#OCIS_LDAP_URI=ldap://localhost:9235 
-#OCIS_LDAP_USER_BASE_DN="ou=users,dc=yunohost,dc=org"
-#OCIS_LDAP_GROUP_BASE_DN="ou=groups,dc=yunohost,dc=org"
-#OCIS_LDAP_USER_FILTER=(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))
-#OCIS_LDAP_LOGIN_ATTRIBUTES="uid"
-#OCIS_LDAP_USER_SCHEMA_MAIL="mail"
-#OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME="cn"
-=======
-
 #Theme Settings
 WEB_UI_THEME_SERVER=https://__DOMAIN__
 WEB_UI_THEME_PATH=/themes/custom/theme.json
@@ -91,4 +71,3 @@ OCIS_LDAP_USER_ENABLED_ATTRIBUTE=“ms-DS-User-Account-Disabled”
 #OCIS_LOG_FILE=/home/connor/ocis.log
 #OCIS_LOG_PRETTY=true
 #OCIS_LOG_COLOR=true
->>>>>>> Stashed changes