diff --git a/de/home/.config/katerc b/de/home/.config/katerc
index d33297f..1e8c02e 100644
--- a/de/home/.config/katerc
+++ b/de/home/.config/katerc
@@ -134,7 +134,7 @@ Scroll Bar Mini Map Width=60
 Scroll Bar MiniMap=true
 Scroll Bar Preview=true
 Scroll Past End=false
-Search/Replace Flags=141
+Search/Replace Flags=140
 Shoe Line Ending Type in Statusbar=false
 Show Documentation With Completion=true
 Show File Encoding=true
@@ -174,8 +174,8 @@ SetEditor=false
 2 screens: Width=490
 2048x1280 screen: Height=409
 2048x1280 screen: Width=1234
-3 screens: Height=1053
-3 screens: Width=1325
+3 screens: Height=605
+3 screens: Width=1024
 
 [filetree]
 editShade=183,220,246
diff --git a/de/home/.librewolf/profiles.ini b/de/home/.librewolf/profiles.ini
index 4275bad..f340a4e 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=0585997e
+=======
+StoreID=a61d59be
+>>>>>>> 32e9a459bbd456c8cc80887a345bed4497e076ac
 ShowSelector=0
 
 [General]