Minor merge fix