diff --git a/VERSION.json b/VERSION.json
index d5825f0..a66d259 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1,9 +1,4 @@
 {
-<<<<<<< HEAD
     "version": "4.13.0",
     "stage": "rc4"
-=======
-    "version": "4.13.1",
-    "stage": "alpha0"
->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca
 }