ip: fix merge issue