Issue #468 fixing conflicts again