the idea is to never merge to the branches. only cherry-pick