Updated readme
fixed conflicts
Updated readme