better DDP added conflict handling