adds commit-merge.txt
Merge branch 'feature-branch-merge' because we needed to.