Resolving Merge Conflict Leftovers