Resolved merge conflict

Author: coderespawn

Source/PrefabricatorRuntime/Private/Prefab/PrefabTools.cpp

@@ -566,10 +566,10 @@ void FPrefabTools::LoadStateFromPrefabAsset(APrefabActor* PrefabActor, const FPr
 		// Set the transform
 		FTransform WorldTransform = ActorItemData.RelativeTransform * PrefabActor->GetTransform();
 		if (ChildActor->GetRootComponent()) {
-            EComponentMobility::Type OldChildMobility = EComponentMobility::Movable;
-            if (ChildActor->GetRootComponent()) {
-                OldChildMobility = ChildActor->GetRootComponent()->Mobility;
-            }
+			EComponentMobility::Type OldChildMobility = EComponentMobility::Movable;
+			if (ChildActor->GetRootComponent()) {
+				OldChildMobility = ChildActor->GetRootComponent()->Mobility;
+			}
 			ChildActor->GetRootComponent()->SetMobility(EComponentMobility::Movable);
 			ChildActor->SetActorTransform(WorldTransform);
 			ChildActor->GetRootComponent()->SetMobility(OldChildMobility);