brance test
and simple
&simple
confict fixed
add merge
merge with no-ff