DOCS: resolve conflict