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