add merge
merge with no-ff
fang write it
can write it
conflict fixed