Solve conflicts from merging.