Merge remote changes and resolve conflicts

docker-compose.yml

@@ -13,8 +13,6 @@ services:
     volumes:
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - certbot-etc:/etc/letsencrypt:ro
-      - certbot-var:/var/lib/letsencrypt:ro
       - webroot:/var/www/html
     depends_on:
       - backend