[15-Conflict-Resolution.gif]