Fixed scene merger

Assets/GitMerge/Editor/GitMergeWindow.cs

@@ -178,13 +178,13 @@ namespace GitMerge
             
             if (mergeManager is { allMergeActions: not null })
             {
-                GlobalObjectId targetId = GlobalObjectId.GetGlobalObjectIdSlow(target);
+                ObjectID targetId = ObjectID.GetFor(target);
                 
                 foreach (var mergeAction in mergeManager.allMergeActions)
                 {
-                    GlobalObjectId actionId = GlobalObjectId.GetGlobalObjectIdSlow(mergeAction.ours);
+                    ObjectID actionId = ObjectID.GetFor(mergeAction.ours);
                     
-                    if (targetId.targetObjectId == actionId.targetObjectId)
+                    if (targetId.id == actionId.id)
                     {
                         found = true;
                         isResolved = mergeAction.merged;

Assets/GitMerge/Editor/MergeManagerScene.cs

@@ -6,6 +6,7 @@ namespace GitMerge
     using UnityEngine.SceneManagement;
     using UnityEditor.SceneManagement;
     using System.Collections.Generic;
+    using Object = UnityEngine.Object;
 
     public class MergeManagerScene : MergeManagerBase
     {
@@ -61,9 +62,8 @@ namespace GitMerge
                 theirScene = EditorSceneManager.OpenScene(theirFilename, OpenSceneMode.Additive);
 
                 var addedObjects = GetAllNewSceneObjects(ourObjects);
-                ObjectDictionaries.AddToTheirObjects(addedObjects);
                 BuildAllMergeActions(ourObjects, addedObjects);
-                
+                ObjectDictionaries.AddToTheirObjects(addedObjects);
                 MoveGameObjectsToScene(theirScene.GetRootGameObjects(), activeScene);
             }
             finally