Correct readme.md and removed some merge conflict