diff --git a/default.conf b/default.conf
deleted file mode 100644
index 01cf7ae..0000000
--- a/default.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-server {
-    listen 80;
-    server_name localhost;
-
-    client_body_timeout 10s;
-    client_header_timeout 10s;
-    send_timeout 10s;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html;
-        try_files $uri $uri/ /index.html;
-        limit_req zone=one burst=5 nodelay;
-        limit_conn conn_limit_per_ip 10;
-
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|webp)$ {
-            expires 4h;
-            add_header Cache-Control "public, max-age=14400";
-        }
-
-        location ~* \.(webp)$ {
-            expires 4h;
-            add_header Cache-Control "public, max-age=14400";
-        }
-
-        location ~* rocket-loader\.min\.js$ {
-            expires 2d;
-            add_header Cache-Control "public, max-age=172800";
-        }
-
-        location ~* avatars\.githubusercontent\.com {
-            expires 5m;
-            add_header Cache-Control "public, max-age=300";
-        }
-
-        location ~* shields\.io {
-            expires 1d;
-            add_header Cache-Control "public, max-age=86400";
-        }
-    }
-}
diff --git a/nginx.conf b/nginx.conf
index 384d5d2..497dbbb 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-http {
-    limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s;
-    limit_conn_zone $binary_remote_addr zone=conn_limit_per_ip:10m;
-    include /etc/nginx/conf.d/*.conf;
-=======
 server {
     listen 80;
     server_name localhost;
@@ -13,5 +7,4 @@ server {
         index  index.html;
         try_files $uri $uri/ /index.html;
     }
->>>>>>> parent of 4d65766 (set: nginx cache)
-}
+}
\ No newline at end of file