add simple
&simple
cinflict fixed
test
mrege with no-ff