updating readme
fixed conflict