update docs
fix conflict