Solving merge conflicts