Merge Conflicts resolution