diff --git a/type/__recycledcloud_nginx_vhost/parameter/boolean.orig b/type/__recycledcloud_nginx_vhost/parameter/boolean.orig
deleted file mode 100644
index 00ce59e..0000000
--- a/type/__recycledcloud_nginx_vhost/parameter/boolean.orig
+++ /dev/null
@@ -1,7 +0,0 @@
-<<<<<<< HEAD
-noindex
-=======
-no-tls
-no-hsts
-obtain-cert
->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.
diff --git a/type/__recycledcloud_nginx_vhost/parameter/optional b/type/__recycledcloud_nginx_vhost/parameter/optional
index 0561d23..9c47616 100644
--- a/type/__recycledcloud_nginx_vhost/parameter/optional
+++ b/type/__recycledcloud_nginx_vhost/parameter/optional
@@ -1,3 +1,4 @@
 domain
 config
 altdomains
+lport
diff --git a/type/__recycledcloud_nginx_vhost/parameter/optional.orig b/type/__recycledcloud_nginx_vhost/parameter/optional.orig
deleted file mode 100644
index bb925f0..0000000
--- a/type/__recycledcloud_nginx_vhost/parameter/optional.orig
+++ /dev/null
@@ -1,7 +0,0 @@
-<<<<<<< HEAD
-index
-=======
-domain
-lport
-config
->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.