DOC: remove merge conflict