Fixed conflicts after introduction of DocID.