reconcile merge conflict in documentation.