dev branch
branch master
conflict fixed
delete the last line
AND simple
& simple
and simple