avoid merge conflicts