another merge fix