updated with required text
fixed conflicts