Merge conflicts solution