update: change order of picks to fix merge error