[Issue 10178] New: deltaMPR conflict resolution issues