Fixed merge conflicts

Frontend/nginx.conf

@@ -12,10 +12,6 @@ server {
         add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
     }
 
-<<<<<<< HEAD
-    #error_page  404              /404.html;
-
-=======
     location /java/ {
         proxy_pass http://xmltools-backend:8081/;
         proxy_set_header Host $host;
@@ -36,7 +32,6 @@ server {
 
 
 
->>>>>>> master
     # redirect server error pages to the static page /50x.html
     #
     error_page   500 502 503 504  /50x.html;