diff --git a/nginx.conf.conflict b/nginx.conf.conflict
deleted file mode 100644
index 553c786..0000000
--- a/nginx.conf.conflict
+++ /dev/null
@@ -1 +0,0 @@
-kalkulator.electricentropy.eu:8090