added commit-merge.txt
Added new-merge.txt
Removed new-merge.txt
Merge branch 'feature-branch-merge'