updated readme
fixed conflict