avoiding merge conflicts