diff --git a/metadata/org.secuso.privacyfriendlyruler.yml b/metadata/org.secuso.privacyfriendlyruler.yml
index dc6be3d84b..1e2982a7c3 100644
--- a/metadata/org.secuso.privacyfriendlyruler.yml
+++ b/metadata/org.secuso.privacyfriendlyruler.yml
@@ -45,13 +45,6 @@ Builds:
     gradle:
       - yes
 
-<<<<<<< HEAD
-ArchivePolicy: 0
-AutoUpdateMode: None
-UpdateCheckMode: None
-CurrentVersion: '1.1'
-CurrentVersionCode: 3
-=======
   - versionName: 1.1.1
     versionCode: 4
     commit: e89615b60841bbda92fee7164b03ac3d7abdda4b
@@ -65,4 +58,3 @@ UpdateCheckMode: Tags
 UpdateCheckName: org.secuso.privacyfriendlyrulerapp
 CurrentVersion: 1.1.1
 CurrentVersionCode: 4
->>>>>>> 1f27db4903d3c5934524c872af52b57306dfef52