conflict-resolution

(1)