Added commit-merge.txt
Merging feature-branch-merge