issue #2430: Fixing conflicts.