diff --git a/library.json b/library.json
index b93cbf9..e470f5e 100644
--- a/library.json
+++ b/library.json
@@ -6,11 +6,7 @@
     "compatibility": {
         "version": "7.1"
     },
-<<<<<<< HEAD
-    "version": "0.173",
-=======
-    "version": "0.189",
->>>>>>> 04d67d2e0d688a8c20edd9a347dad2b09ea62229
+    "version": "0.190",
     "build": 0,
     "date": 0
 }
\ No newline at end of file