DOC: conflicts with master