create branch dev
AND simple
& simple
conflict fixed