fix merge issue on package