resolve merge conflicts in readme.md