fixed merge conflicts in README