Change readme
Resolved conflict