diff --git a/404.md b/404/404.md
similarity index 100%
rename from 404.md
rename to 404/404.md
diff --git a/resources/javall.js b/resources/javall.js
index 2c94ca4..ddf25c5 100644
--- a/resources/javall.js
+++ b/resources/javall.js
@@ -5,11 +5,3 @@ console.log('%cDoor Guus van Meerveld', "color:#9c9c9c; font-size:30px;");
 var shortcon = $("<link>", {rel :'shortcut icon',href:'/resources/img/favicon.ico'})
 
 $('head').append(shortcon)
-<<<<<<< HEAD
-
-// Https
-if (location.protocol == "http:" && location.port !== "3000" && location.host !== "guusvanmeerveld.online") {
-  location.protocol = "https:"
-}
-=======
->>>>>>> e28a9453f062af65383d1324fd83a161d4d22222