boost: fix merge error