Merge conflicts solving