updated readme
fixed conflict in readme