updated readme
fixed conflicts