diff --git a/nginx.conf b/nginx.conf
index 9af8d7b..c3ab9e9 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -23,13 +23,8 @@ http {
     }
 
     server {
-<<<<<<< HEAD
         listen 443 ssl;
         server_name your.domain.example;
-=======
-        listen 443;
-        server_name git.evil-bird.ru;
->>>>>>> cbd9e3c (-ssl2)
 
         ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem;
         ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem;