diff --git a/roles/authelia-and-nginx/defaults/main.json.orig b/roles/authelia-and-nginx/defaults/main.json.orig
deleted file mode 100644
index 45e49bb..0000000
--- a/roles/authelia-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"var_authelia_and_nginx_domain": "authelia.example.org",
-<<<<<<< HEAD
-	"var_authelia_and_nginx_tls_mode": "enable"
-=======
-	"var_authelia_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/authelia-and-nginx/vardef.json.orig b/roles/authelia-and-nginx/vardef.json.orig
deleted file mode 100644
index 7b4f161..0000000
--- a/roles/authelia-and-nginx/vardef.json.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-<<<<<<< HEAD
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-=======
-		"type": "string",
-		"options": [
-			"disable",
-			"enable",
-			"force"
-		],
-		"mandatory": false
->>>>>>> main
-	}
-}
diff --git a/roles/dokuwiki-and-nginx/defaults/main.json.orig b/roles/dokuwiki-and-nginx/defaults/main.json.orig
deleted file mode 100644
index 3fd9025..0000000
--- a/roles/dokuwiki-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"var_dokuwiki_and_nginx_directory": "/opt/dokuwiki",
-	"var_dokuwiki_and_nginx_domain": "dokuwiki.example.org",
-<<<<<<< HEAD
-	"var_dokuwiki_and_nginx_tls_mode": "enable"
-=======
-	"var_dokuwiki_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/dokuwiki-and-nginx/vardef.json.orig b/roles/dokuwiki-and-nginx/vardef.json.orig
deleted file mode 100644
index b2b79c4..0000000
--- a/roles/dokuwiki-and-nginx/vardef.json.orig
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"directory": {
-		"type": "string",
-		"mandatory": false
-	},
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-<<<<<<< HEAD
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-=======
-		"type": "string",
-		"options": [
-			"disable",
-			"enable",
-			"force"
-		],
-		"mandatory": false
->>>>>>> main
-	}
-}
diff --git a/roles/element-and-nginx/defaults/main.json.orig b/roles/element-and-nginx/defaults/main.json.orig
deleted file mode 100644
index eb35196..0000000
--- a/roles/element-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"var_element_and_nginx_domain": "element.example.org",
-	"var_element_and_nginx_path": "/opt/element",
-<<<<<<< HEAD
-	"var_element_and_nginx_tls_mode": "enable"
-=======
-	"var_element_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/gitlab-and-nginx/defaults/main.json.orig b/roles/gitlab-and-nginx/defaults/main.json.orig
deleted file mode 100644
index 20ce517..0000000
--- a/roles/gitlab-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"var_gitlab_and_nginx_domain": "element.example.org",
-	"var_gitlab_and_nginx_path": "/opt/element",
-<<<<<<< HEAD
-	"var_gitlab_and_nginx_tls_mode": "enable"
-=======
-	"var_gitlab_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/hedgedoc-and-nginx/defaults/main.json.orig b/roles/hedgedoc-and-nginx/defaults/main.json.orig
deleted file mode 100644
index 9140f21..0000000
--- a/roles/hedgedoc-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org",
-<<<<<<< HEAD
-	"var_hedgedoc_and_nginx_tls_mode": "enable"
-=======
-	"var_hedgedoc_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/hedgedoc-and-nginx/vardef.json.orig b/roles/hedgedoc-and-nginx/vardef.json.orig
deleted file mode 100644
index 7b4f161..0000000
--- a/roles/hedgedoc-and-nginx/vardef.json.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-<<<<<<< HEAD
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-=======
-		"type": "string",
-		"options": [
-			"disable",
-			"enable",
-			"force"
-		],
-		"mandatory": false
->>>>>>> main
-	}
-}
diff --git a/roles/synapse-and-nginx/defaults/main.json.orig b/roles/synapse-and-nginx/defaults/main.json.orig
deleted file mode 100644
index b7d6849..0000000
--- a/roles/synapse-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"var_synapse_and_nginx_domain": "REPLACE_ME",
-<<<<<<< HEAD
-	"var_synapse_and_nginx_tls_mode": "enable"
-=======
-	"var_synapse_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/synapse-and-nginx/vardef.json.orig b/roles/synapse-and-nginx/vardef.json.orig
deleted file mode 100644
index 7b4f161..0000000
--- a/roles/synapse-and-nginx/vardef.json.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-<<<<<<< HEAD
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-=======
-		"type": "string",
-		"options": [
-			"disable",
-			"enable",
-			"force"
-		],
-		"mandatory": false
->>>>>>> main
-	}
-}
diff --git a/roles/vikunja-and-nginx/defaults/main.json.orig b/roles/vikunja-and-nginx/defaults/main.json.orig
deleted file mode 100644
index 229204a..0000000
--- a/roles/vikunja-and-nginx/defaults/main.json.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"var_vikunja_and_nginx_domain": "vikunja.example.org",
-<<<<<<< HEAD
-	"var_vikunja_and_nginx_tls_mode": "enable"
-=======
-	"var_vikunja_and_nginx_tls_mode": "force"
->>>>>>> main
-}
diff --git a/roles/vikunja-and-nginx/vardef.json.orig b/roles/vikunja-and-nginx/vardef.json.orig
deleted file mode 100644
index 7b4f161..0000000
--- a/roles/vikunja-and-nginx/vardef.json.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-<<<<<<< HEAD
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-=======
-		"type": "string",
-		"options": [
-			"disable",
-			"enable",
-			"force"
-		],
-		"mandatory": false
->>>>>>> main
-	}
-}