Merge conflicts solve