allow referencing existing objects when part of the conflict set#531

mpareja wants to merge 1 commit intoautomerge:mainautomerge/automerge-classic:mainfrom

mpareja:mpareja-allow-resolving-conflicts-with-existing-objectsmpareja/automerge:mpareja-allow-resolving-conflicts-with-existing-objectsCopy head branch name to clipboard