Fix vpp merge jobs