diff --git a/.gitignore b/.gitignore
index 4a06549..dad0abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 # Environment files
 *.env
-<<<<<<< HEAD
-=======
 
 # Nextcloud collabora file
 loolwsd.xml
@@ -14,4 +12,3 @@ loolwsd.xml
 **/redis/
 **/html/
 **/volumes/
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index c3ef64d..cfda5c1 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -61,18 +61,11 @@ services:
       - "traefik.http.routers.gitea.tls=true"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-<<<<<<< HEAD
-      - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
-      - "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
-      - "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
-      - "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
-=======
       # SSH
       #- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
       #- "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
       #- "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
       #- "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
     depends_on:
       - gitea-db
     networks:
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 6ef8973..93d84ac 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -36,12 +36,7 @@ services:
     volumes:
       - ${NEXTCLOUD_ROOT}/redis:/data
       - /etc/localtime:/etc/localtime:ro
-<<<<<<< HEAD
-      - /etc/timezone:/etc/timezone:ro      
-=======
       - /etc/timezone:/etc/timezone:ro
-      
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
 
   nextcloud-app:
     depends_on:
@@ -151,5 +146,3 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml
-  
-  
diff --git a/nextcloud/mariadb-conf/docker.cnf b/nextcloud/mariadb-conf/docker.cnf
index 5d6ab1e..aae35ff 100644
--- a/nextcloud/mariadb-conf/docker.cnf
+++ b/nextcloud/mariadb-conf/docker.cnf
@@ -3,8 +3,4 @@ innodb_buffer_pool_size=2G
 innodb_io_capacity=4000
 innodb_io_capacity_max=4000
 skip-host-cache
-<<<<<<< HEAD
 skip-name-resolve
-=======
-skip-name-resolve
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index ceed372..3278183 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
   socket_proxy:
     external:
       name: socket_proxy
-  
+
 
 services:
   # Only accept needed incoming docker API calls
@@ -103,17 +103,13 @@ services:
       - "--log.level=DEBUG"
       # API and Dashboard
       #- "--api.insecure=true"
-      - "--api=true"      
+      - "--api=true"
       - "--api.dashboard=true"
       # Docker as provider
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       # Entrypoints (not HTTPS)
       - "--entrypoints.web.address=:80"
-<<<<<<< HEAD
-      #- "--entrypoints.teamspeak.address=:9987/udp"
-=======
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
       # HTTPS (websecure entrypoint)
       - "--entrypoints.websecure.address=:443"
       # TS3 entrypoints
@@ -145,10 +141,7 @@ services:
       - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)"
       - "traefik.http.routers.http_catchall.entrypoints=web"
       - "traefik.http.routers.http_catchall.middlewares=https-redirect"
-<<<<<<< HEAD
 
-=======
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
     ports:
       # The HTTP port
       - "80:80"
diff --git a/ts3/README.md b/ts3/README.md
index f4a302b..292e07e 100644
--- a/ts3/README.md
+++ b/ts3/README.md
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-No traefik ready!
-
-This is service is not routed by traefik because the UDP routing causes package loss.
-=======
-This is now routed via traefik. 
-Still checking performance if working it is.
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
+This is now routed via traefik.
+Still checking performance if there is no package loss.
diff --git a/ts3/docker-compose.yml b/ts3/docker-compose.yml
index c98da5d..9afa697 100644
--- a/ts3/docker-compose.yml
+++ b/ts3/docker-compose.yml
@@ -2,9 +2,8 @@ version: '3.5'
 
 networks:
   default:
-<<<<<<< HEAD
-  external:
-  name: traefik_default
+    external:
+      name: traefik_default
 
 services:
   teamspeak-app:
@@ -42,9 +41,6 @@ teamspeak-db:
   restart: unless-stopped
   volumes:
   - ./db:/var/lib/mysql
-=======
-    external:
-      name: traefik_default
 
 services:
   teamspeak-app:
@@ -67,7 +63,7 @@ services:
       - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
       - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
       - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
-      - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"      
+      - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"
       # udp
       - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"
       - "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp"