Merge successful, figuring out edits