add commit-merge.txt to branch-merge
Merge branch 'feature-branch-merge'