fixing up merge conflicts in README