Correcting previous conflict resolution (very simple). Re #6754.