Merge remote changes and resolve conflicts

docker/nginx/nginx.conf

@@ -1,5 +1,6 @@
 user nginx;
 worker_processes auto;
+
 error_log /var/log/nginx/error.log notice;
 pid /var/run/nginx.pid;
 
@@ -16,8 +17,9 @@ http {
                    '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /var/log/nginx/access.log main;
+
     sendfile on;
     keepalive_timeout 65;
 
     include /etc/nginx/conf.d/*.conf;
-}
+}