resolve a merge