commit before merge the subtree
commit after merge