diff --git a/defaultPackageList b/defaultPackageList
index e329eeb..6a4d11e 100644
--- a/defaultPackageList
+++ b/defaultPackageList
@@ -17,12 +17,8 @@ VeCanSetup	    	kwindrem    latest
 RpiDisplaySetup     kwindrem    latest
 RpiGpioSetup        kwindrem    latest
 123SmartBMS-Venus	123electric	latest
-<<<<<<< Updated upstream
-FroniusSmartmeter   SirUli      main
-=======
 FroniusSmartmeter   SirUli      main
 dbus-i2c            pulquero    latest
 DCSystemAggregator  pulquero    latest
 gatt-exec-server    pulquero    latest
 RpiTemperature      TimD1981    latest
->>>>>>> Stashed changes
diff --git a/venus-data.UninstallPackages.tar.gz b/venus-data.UninstallPackages.tar.gz
index 4be9e5c..e3a611d 100644
Binary files a/venus-data.UninstallPackages.tar.gz and b/venus-data.UninstallPackages.tar.gz differ
diff --git a/venus-data.tgz b/venus-data.tgz
index 0bb4a9b..a74504d 100644
Binary files a/venus-data.tgz and b/venus-data.tgz differ