diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py
index aca91f866a..5eee8d8a55 100755
--- a/cura/PlatformPhysics.py
+++ b/cura/PlatformPhysics.py
@@ -68,15 +68,7 @@ class PlatformPhysics:
             # Move it downwards if bottom is above platform
             move_vector = Vector()
 
-            # Check if this is the first time a project file node was loaded (disable auto drop in that case), defaults to True
-            should_auto_drop = node.getSetting("auto_drop", True)
-
-            # This should NOT happen if the scene change was triggered by a tool (like translate), only on project load
-            if was_triggered_by_tool:
-                should_auto_drop = True
-
-            # If a node is grouped or it's loaded from a project file (auto-drop disabled), don't move it down
-            if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup")) and node.isEnabled() and should_auto_drop:
+            if Preferences.getInstance().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup")) and node.isEnabled(): #If an object is grouped, don't move it down
                 z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
                 move_vector = move_vector.set(y=-bbox.bottom + z_offset)
 
diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py
index b947c4eb39..2173afb2cc 100755
--- a/plugins/3MFReader/ThreeMFReader.py
+++ b/plugins/3MFReader/ThreeMFReader.py
@@ -73,14 +73,18 @@ class ThreeMFReader(MeshReader):
 
         return temp_mat
 
-    ##  Convenience function that converts a SceneNode object (as obtained from libSavitar) to a Uranium SceneNode.
-    #   \returns Uranium SceneNode.
+
+    ##  Convenience function that converts a SceneNode object (as obtained from libSavitar) to a Uranium scenenode.
+    #   \returns Uranium Scenen node.
     def _convertSavitarNodeToUMNode(self, savitar_node):
         um_node = SceneNode()
+<<<<<<< HEAD
 
         # Disable the auto-drop feature when loading a project file and processing the nodes for the first time
         um_node.setSetting("auto_drop", False)
 
+=======
+>>>>>>> parent of 11ebdf73... CURA-4269 disable auto-drop for first time loaded models from project files
         transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation())
         um_node.setTransformation(transformation)
         mesh_builder = MeshBuilder()