AND simple
confict fixed
add merge
merge with no-ff