f the readme
fix merge conflict