changed wording
fixed conflicts