From 07bd2e21de2ad54316cf41b75396371cb2d2b4fe Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 30 Apr 2024 06:47:08 +0200
Subject: [PATCH] Resolve merge conflict

---
 .../hosts/maya/plugins/workfile_build/load_placeholder.py      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py b/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
index 5bfaae6500..cf4a350c36 100644
--- a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
+++ b/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
@@ -255,7 +255,8 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
             if scene_parent:
                 cmds.parent(node, scene_parent)
             else:
-                cmds.parent(node, world=True)
+                if cmds.listRelatives(node, parent=True):
+                    cmds.parent(node, world=True)
 
         holding_sets = cmds.listSets(object=placeholder.scene_identifier)
         if not holding_sets: