Application-Level Merge - Conflict Resolution Strategies | OneNoughtOne