add 2.md to branch dev
AND simple
& simple
conflict fixed