Removing non-bootstrap docs
Resolving merge conflicts