fix pb merge