branch test
AND simple
& simple
conflict fixed
modify at dev branch
delete Modify at dev branch
merge with no-ff