Change readme
FIX conflict