update README.md (temp)
fix merge conflicts