added commit-merge.txt to branch feature-branch-rebase
resolved merge conflicts