fix merge issue in dependency modules