merge subtree's change of master to good-branch