package-stash-conflicts