Issue #468 Fixing conflicts again