core: fix failed merge.