Minor merge fix.