added commit-merge
merging