diff --git a/versioning.js b/versioning.js
index ea45eff7..8e3104d5 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,11 @@
 "use strict";
 
+<<<<<<< HEAD
 // version and caching control
 const version = "1.87.15"; // generator version, update each time
+=======
+const version = "1.83.0"; // generator version, update each time
+>>>>>>> 1d405891 (pump version to 1.83.0)
 
 {
   document.title += " v" + version;