another #merge fix