diff --git a/de/home/.librewolf/profiles.ini b/de/home/.librewolf/profiles.ini
index 50065b7..c56355e 100644
--- a/de/home/.librewolf/profiles.ini
+++ b/de/home/.librewolf/profiles.ini
@@ -17,17 +17,18 @@ Name=Penelope
 IsRelative=1
 Path=penelope
 Default=1
-<<<<<<< HEAD
 StoreID=0585997e
-=======
-StoreID=a61d59be
->>>>>>> dd66c0054d35a5fdb855626dfd47c4b646dc59de
 ShowSelector=1
 
 [General]
 StartWithLastProfile=1
 Version=2
 
+[Profile4]
+Name=testing
+IsRelative=1
+Path=4z689ygf.testing
+
 [Install6C4726F70D182CF7]
 Default=penelope
 Locked=1
@@ -37,8 +38,3 @@ Name=School
 IsRelative=1
 Path=school
 
-[Profile4]
-Name=testing
-IsRelative=1
-Path=4z689ygf.testing
-