Modified readme
fixed conflicts