changed readme
fixed conflict