diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h
index 28c96303..9ae38021 100644
--- a/include/Engine/Core/World.h
+++ b/include/Engine/Core/World.h
@@ -55,7 +55,7 @@ public:
 
     // Merge another world into this one
     // Returns a map that maps entities from the other world to their copies in this one
-    std::unordered_map<EntityID, EntityID> Merge(World& other);
+    std::unordered_map<EntityID, EntityID> Merge(const World* other);
 
 private:
     EventBroker* m_EventBroker = nullptr;
diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp
index 96c4660d..0952a53b 100644
--- a/src/Engine/Core/World.cpp
+++ b/src/Engine/Core/World.cpp
@@ -169,27 +169,29 @@ EntityWrapper World::GetFirstEntityByName(const std::string& name)
     return EntityWrapper::Invalid;
 }
 
-std::unordered_map<EntityID, EntityID> World::Merge(World& other)
+std::unordered_map<EntityID, EntityID> World::Merge(const World* other)
 {
     std::unordered_map<EntityID, EntityID> oldToNew;
 
     // Create new entities
-    for (auto& kv : other.m_EntityParents) {
+    for (auto& kv : other->m_EntityParents) {
         EntityID entity = kv.first;
 
         EntityID newEntity = CreateEntity();
-        SetName(newEntity, other.GetName(entity));
+        SetName(newEntity, other->GetName(entity));
         oldToNew[entity] = newEntity;
     }
     // Fix relationships
-    for (auto& kv : other.m_EntityParents) {
+    for (auto& kv : other->m_EntityParents) {
         EntityID entity = kv.first;
         EntityID parent = kv.second;
-        SetParent(oldToNew.at(entity), oldToNew.at(parent));
+        if (parent != EntityID_Invalid) {
+            SetParent(oldToNew.at(entity), oldToNew.at(parent));
+        }
     }
 
     // Transfer components
-    for (auto& kv : other.m_ComponentPools) {
+    for (auto& kv : other->m_ComponentPools) {
         auto& componentType = kv.first;
         ComponentPool* pool = kv.second;
         // Register pool if it's not present in world