[Issue 10178] deltaMPR conflict resolution issues