Docs update and merge conflict