Conflict_Resolved — Deca