Solve merge problems.