resolving readme.md conflict