Update readme.md

Note on gitflow
merge conflict