Added conflict_detect module