Solving merge conflicts.