fix index. added docs
fix conflict