Solving a merge