Trying to reconcile edits from a merge