preventing merge conflicts