fix pb resuling from merge