Revised readme
fixed conflicts