add merge
merge with no-ff
bug101
mergedbug
test
testmaster