diff --git a/nextcloud/collabora/loolwsd.xml.tpl b/nextcloud/collabora/loolwsd.xml.tpl
index f8551e4..c27a9a5 100644
--- a/nextcloud/collabora/loolwsd.xml.tpl
+++ b/nextcloud/collabora/loolwsd.xml.tpl
@@ -142,7 +142,7 @@
     <storage desc="Backend storage">
         <filesystem allow="false" />
         <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\\.domain\\.com</host>
+            <host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\.domain\.com</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
diff --git a/nextcloud/live.env.tpl b/nextcloud/live.env.tpl
index bffae97..1fcae04 100644
--- a/nextcloud/live.env.tpl
+++ b/nextcloud/live.env.tpl
@@ -14,13 +14,18 @@ REDIS_HOST_PASSWORD=password_redis
 NEXTCLOUD_ROOT=/home/compute/services/nextcloud
 NEXTCLOUD_DATA_DIR=/srv/nextcloud/data
 NEXTCLOUD_FQDN=your_nextcloud_sub_domain.domain.com
+<<<<<<< HEAD
 TRAEFIK_CONTAINER_IP=172.27.0.16 # This is the traefik container ip in the traefik_default network. I configured the traefik container with a static IP so this does not have to be changed anymore.
+=======
+# This is the IP of the Trafik container. This changes if the traefik container restarts. If it is not the current traefik container IP collabora does not work. Check the current traefik container IP with: docker inspect traefik and get the IP from the Networks -> traefik_default -> IPAddress section
+TRAEFIK_CONTAINER_IP=172.27.0.16 # This has to be the current IP of the traefik container check this with docker inspect traefik
+>>>>>>> 1febed0fecff283ba71842944efab92fbe0a649c
 PHP_MEMORY_LIMIT=2048M
 PHP_UPLOAD_LIMIT=8G
 
 # Collabora
 COLLABORA_FQDN=collabora.domain.com
-COLLABORA_DOMAIN=nextcloud_sub_domain\\.domain\\.com # This is the domain which the collabora server is requests accepting from.
+COLLABORA_DOMAIN=nextcloud_sub_domain\.domain\.com # This is the domain which the collabora server is requests accepting from.
 COLLABORA_USERNAME=username
 COLLABORA_PASSWORD=password_collabora