use `git subtree` helper instead of doing manual subtree merge