Conflict resolution

CESIE ETS