find another case
master
conflict fixed master
add merge
merge with no-ff