tools: fix merge issue