diff --git a/plugin.json b/plugin.json
index 6709932..cc4e098 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,11 +1,7 @@
 {
   "slug": "Fundamental",
   "name": "VCV Free",
-<<<<<<< HEAD
   "version": "2.6.1-SR",
-=======
-  "version": "2.6.1",
->>>>>>> e80c373575b337720703a41691536272b21b554c
   "license": "GPL-3.0-or-later",
   "brand": "VCV",
   "author": "VCV",