diff --git a/de/home/.librewolf/profiles.ini b/de/home/.librewolf/profiles.ini
index f340a4e..d7b25f5 100644
--- a/de/home/.librewolf/profiles.ini
+++ b/de/home/.librewolf/profiles.ini
@@ -17,22 +17,13 @@ Name=Penelope
 IsRelative=1
 Path=penelope
 Default=1
-<<<<<<< HEAD
 StoreID=0585997e
-=======
-StoreID=a61d59be
->>>>>>> 32e9a459bbd456c8cc80887a345bed4497e076ac
 ShowSelector=0
 
 [General]
 StartWithLastProfile=1
 Version=2
 
-[Profile4]
-Name=testing
-IsRelative=1
-Path=4z689ygf.testing
-
 [Install6C4726F70D182CF7]
 Default=penelope
 Locked=1
@@ -42,3 +33,8 @@ Name=School
 IsRelative=1
 Path=school
 
+[Profile4]
+Name=testing
+IsRelative=1
+Path=4z689ygf.testing
+