Fix merge conflict.
Resolve docs conflict.