Edit readme.md
Resolve conflicts with readme.md