add dev.md
i like git
i like svn
conflict solved