update readme
change to master
fix merge conflict