Ticket #1498 - Conflict detection and resolution

This branch adds