fix(cockpit/build): fix the failed merge