Solving merge conflicts on style