added Entity conflict handling
renamed conflict handler method