added shell of the docs
DOC: fix merge conflicts