Merge conflict prevention 2