added commit.merge.txt
added merge of feature-branch-merge