diff --git a/boom.project.gmx b/boom.project.gmx
index 905595b..545acd7 100644
--- a/boom.project.gmx
+++ b/boom.project.gmx
@@ -128,7 +128,6 @@
   <objects name="objects">
     <objects name="Oggetti">
       <object>objects\o_generale</object>
-      <object>objects\o_wall_norm</object>
       <object>objects\o_CD</object>
       <objects name="Squadre">
         <object>objects\o_squadra_sin</object>
@@ -209,29 +208,58 @@
           <object>objects\o_chiave_green</object>
         </objects>
       </objects>
-      <objects name="Muri"/>
+      <objects name="Muri">
+        <objects name="Invulnerabili">
+<<<<<<< HEAD
+          <object>objects\o_wall_inv</object>
+          <object>objects\o_wall_inv_L_D</object>
+          <object>objects\o_wall_inv_L_U</object>
+          <object>objects\o_wall_inv_R_U</object>
+          <object>objects\o_wall_inv_R_D</object>
+          <object>objects\o_wall_inv_classic</object>
+          <object>objects\o_wall_inv_totem</object>
+          <object>objects\o_wall_inv_sandbox</object>
+          <objects name="Speciali">
+            <object>objects\o_wall_inv_lock</object>
+            <object>objects\o_magnet</object>
+          </objects>
+=======
+>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
+          <objects name="Go To">
+            <object>objects\o_move_freeplay_levels</object>
+            <object>objects\o_move_strategy</object>
+            <object>objects\o_move_twotris</object>
+            <object>objects\o_move_maxi</object>
+            <object>objects\o_move_sidewalls</object>
+            <object>objects\o_move_classic</object>
+            <object>objects\o_move_stairs</object>
+            <object>objects\o_move_sandbox</object>
+          </objects>
+<<<<<<< HEAD
+=======
+          <object>objects\o_wall_inv</object>
+          <object>objects\o_wall_inv_L_D</object>
+          <object>objects\o_wall_inv_L_U</object>
+          <object>objects\o_wall_inv_R_U</object>
+          <object>objects\o_wall_inv_R_D</object>
+          <object>objects\o_wall_inv_classic</object>
+>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
+        </objects>
+        <objects name="Piazzabili">
+          <object>objects\o_wall_norm</object>
+        </objects>
+      </objects>
+<<<<<<< HEAD
+=======
     </objects>
     <objects name="Pezzi">
-      <object>objects\o_wall_inv</object>
-      <object>objects\o_move_freeplay_levels</object>
-      <object>objects\o_move_strategy</object>
-      <object>objects\o_wall_inv_classic</object>
       <object>objects\o_wall_inv_totem</object>
       <object>objects\o_wall_inv_sandbox</object>
-      <object>objects\o_wall_inv_L_D</object>
-      <object>objects\o_wall_inv_L_U</object>
-      <object>objects\o_wall_inv_R_U</object>
-      <object>objects\o_wall_inv_R_D</object>
-      <object>objects\o_move_twotris</object>
-      <object>objects\o_move_maxi</object>
-      <object>objects\o_move_sidewalls</object>
-      <object>objects\o_move_classic</object>
-      <object>objects\o_move_sandbox</object>
-      <object>objects\o_move_stairs</object>
       <object>objects\o_wall_inv_lock</object>
       <object>objects\o_magnet</object>
       <object>objects\o_sea</object>
       <object>objects\d_fix_count_ent</object>
+>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
     </objects>
     <objects name="Script">
       <object>objects\menus</object>
@@ -245,6 +273,8 @@
       <object>objects\strategy</object>
       <object>objects\boom</object>
       <object>objects\money</object>
+      <object>objects\d_fix_count_ent</object>
+      <object>objects\o_sea</object>
     </objects>
   </objects>
   <rooms name="rooms">