commit-merge in feature-branch-merge