diff --git a/public/js/nav-toggle.js b/public/js/nav-toggle.js
index bd8ff23..ba7c24c 100644
--- a/public/js/nav-toggle.js
+++ b/public/js/nav-toggle.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 function setupNavToggle() {
-=======
-window.addEventListener("DOMContentLoaded", () => {
->>>>>>> testing
   const nav = document.getElementById("siteNav");
   const toggleBtn = document.getElementById("menuToggle");
 
@@ -19,25 +15,11 @@
       }
     });
   }
-<<<<<<< HEAD
 }
 
 window.addEventListener("DOMContentLoaded", setupNavToggle);
 window.addEventListener("resize", setupNavToggle);
-=======
-<<<<<<< Updated upstream
-});
-=======
-}
->>>>>>> Stashed changes
->>>>>>> testing
 
 function toggleMenu() {
   document.getElementById("siteNav").classList.toggle("hide");
 }
-<<<<<<< HEAD
-=======
-
-window.addEventListener("DOMContentLoaded", setupNavToggle);
-window.addEventListener("resize", setupNavToggle);
->>>>>>> testing