update Readme conflict