Updated docs
Fixed merge conflict