Updated api docs
Fixed merge confilcts