fix merge issue, package modified