Merge conflicts resolution