fix package:rerebase