merge pb fix