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