kard: fix merge issue