diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
index a1c5f59..cb7dac0 100644
--- a/calibre-web.subdomain.conf.sample
+++ b/calibre-web.subdomain.conf.sample
@@ -62,8 +62,14 @@ server {
         proxy_set_header X-Scheme $scheme;
     }
 
+<<<<<<< HEAD
     # Feed for Kobo
     location /kobo/ {
+=======
+    # For kobo e-reader sync support
+    # you will need to bypass ^/kobo.* in authentik or authelia if they are used.
+    location /kobo {
+>>>>>>> 92248c0 (support kobo)
         include /config/nginx/proxy.conf;
         include /config/nginx/resolver.conf;
         set $upstream_app calibre-web;
@@ -71,6 +77,12 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
         proxy_set_header X-Scheme $scheme;
+<<<<<<< HEAD
         proxy_buffer_size 32k;
+=======
+        proxy_buffers 4 256k;
+        proxy_busy_buffers_size 256k;
+        proxy_buffer_size 128k;
+>>>>>>> 92248c0 (support kobo)
     }
 }