diff --git a/modules/levels.mjs b/modules/levels.mjs
index 1ee70ae..c182b78 100644
--- a/modules/levels.mjs
+++ b/modules/levels.mjs
@@ -5,14 +5,10 @@ import { Square } from '/modules/enums.mjs';
 const level1Blueprint = [[ Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall ],
                                 [ Square.Wall, Square.Destination, Square.Box, Square.Floor, Square.Player, Square.Wall ],
                                 [ Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall ]];
-<<<<<<< HEAD
 
-const level2Blueprint = [
-=======
-                              
+
 // Blueprint for the second level
-export const level2Blueprint = [
->>>>>>> 380cebd36dc4e3a1f3af185d1a7e3f0adb3e04d1
+const level2Blueprint = [
     [Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Wall, Square.Floor, Square.Floor ],
     [Square.Wall, Square.Destination, Square.Destination, Square.Floor, Square.Floor, Square.Wall, Square.Floor, Square.Floor, Square.Floor, Square.Floor, Square.Floor, Square.Wall, Square.Wall, Square.Wall],
     [Square.Wall, Square.Destination, Square.Destination, Square.Floor, Square.Floor, Square.Wall, Square.Floor, Square.Box, Square.Floor, Square.Floor, Square.Box, Square.Floor, Square.Floor, Square.Wall],