avoiding merge conflict