diff --git a/metadata/net.rocrail.androc.txt b/metadata/net.rocrail.androc.txt
index 5871885188..d7e55467e3 100644
--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@@ -37,11 +37,8 @@ Build Version:347,347,347,target=android-14
 Build Version:348,348,348,target=android-14
 Build Version:350,350,350,target=android-14
 Build Version:351,351,351,target=android-14
-<<<<<<< HEAD
 Build Version:359,359,359,target=android-14
-=======
 Build Version:362,362,362,target=android-14
->>>>>>> 36257f9d7ee884ed31ed732b027f5e5ffd182a85
 
 Update Check Mode:Market
 Current Version:362