fixed a major documentation  bug.
fixed merge conflicts