diff --git a/de/home/.librewolf/profiles.ini b/de/home/.librewolf/profiles.ini
index f48200f..0bf1313 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=a61d59be
+=======
+StoreID=0585997e
+>>>>>>> f5988408ce4f16382a47784c628d13f2c420e482
 ShowSelector=0
 
 [General]