The current listener interface should be able to differentiate between actual conflicts and "mergeConflicts"