corrected merge pb