lixPackageSets.git conflicted via 9c29a340be + eabfa160aa I think, hopefully good now.
9c29a340be
eabfa160aa