merge conflict, updating some documentation