Merge conflict resolution: JSS DP UI