maj docs
resolve merge conflicts