Merging Results

Successful Merge Snapshot
Conflicting Merge Snapshot

The images above show my successful and unsuccessful merge respectively. I believe I managed to succeed in the first merge due to me only modifying certain assets and adding other assets in such a way that they don’t overlap with any other objects. That’s just what I think though.