changed the wording.
fixed merge conflicts