AND simple
simple
confilict fixed
becky
master
fix branch comfict OF becky & master
add merge
merge with no-ff