update readme
fix conflicts