Solving merge problems