diff --git a/RestoolsBBWatchReloaded.js b/RestoolsBBWatchReloaded.js
index 2bad013..11bdeb3 100644
--- a/RestoolsBBWatchReloaded.js
+++ b/RestoolsBBWatchReloaded.js
@@ -1,7 +1,11 @@
 // ==UserScript==
 // @name           IITC plugin: ResTools BB Watch Reloaded
 // @namespace      https://git.martinvylet.cz/vykend/ResTools-BB-Watch-Reloaded
+<<<<<<< HEAD
 // @version        0.6
+=======
+// @version        0.5.2
+>>>>>>> 05b76cec5c49b9a62d1b257c90d75c8e9252fb89
 // @description    Scan window for BBs on ornamented portals, then check results
 // @author         vikend
 // @icon