restore and test again
branch test
AND simple
& simple
confict fixed
add merge
merge with no-ff