Merge conflicts updated