polynomial.h merge fix-up