add commit-merge.txt file to feature-branch-merge
merging