Reconciling package changes