chganged reamde
fixed conflict in readme