Updated doc
Fixed merge conflict