update the readme
fix merge confl