Final merge fix.