added commit-merge.txt