Readme.md confict resolved