readme
fixed conflict