Avoid merge conflicts