Package rename, report on failed merge, push upmerge, new case on new fail