first line in dev branch
AND simple
& simple
conflict fixed
delete last line
merge with no-ff