fix merging merging error of CBP