diff --git a/de/home/.librewolf/profiles.ini b/de/home/.librewolf/profiles.ini
index 0c2c3dc..192d65e 100644
--- a/de/home/.librewolf/profiles.ini
+++ b/de/home/.librewolf/profiles.ini
@@ -17,7 +17,11 @@ Name=Penelope
 IsRelative=1
 Path=penelope
 Default=1
+<<<<<<< HEAD
 StoreID=bf331188
+=======
+StoreID=0585997e
+>>>>>>> 4a65d6aaf2524b038c29cf900251ac14db8c08a2
 ShowSelector=0
 
 [General]