Add mapping for Conflict to ConflictDto