Dealing with merge conflicts.
Merge step.