fix: fix merge issue