updated Readme
fixed conflict