avoid merge conflicts and push styles