Fix incorrect packageType after merge