AND simple
consolidation
&simple
conflict fixed
add merge:
merge with no-ff