adding commit-merge.txt
"had to!"

Merge branch 'feature-branch-merge'