Fix merge

src/technologies.json

@@ -1703,7 +1703,11 @@
       "headers": {
         "X-Confluence-Request-Time": ""
       },
-      "html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\1",
+      "dom": {
+        "li.print-only": {
+          "text": "Atlassian Confluence ([\\d.]+)\\;version:\\1"
+        }
+      },
       "icon": "Atlassian Confluence.svg",
       "implies": "Java",
       "meta": {
@@ -1728,15 +1732,19 @@
         13
       ],
       "cpe": "cpe:/a:atlassian:jira",
-      "html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
       "icon": "Atlassian Jira.svg",
       "implies": "Java",
       "js": {
-        "jira": ""
+        "jira.id": ""
+      },
+      "dom": {
+        "#jira": {
+          "text": ""
+        }
       },
       "meta": {
-        "ajs-version-number": "^(.+)$\\;version:\\1",
+        "application-name": "JIRA",
-        "application-name": "JIRA"
+        "data-version": "([\\d.]+)\\;version:\\1\\;confidence:0"
       },
       "website": "http://www.atlassian.com/software/jira/overview/"
     },
@@ -2484,6 +2492,7 @@
         "recurring"
       ],
       "saas": true,
+      "pricing": ["low", "freemium", "recurring"],
       "website": "http://bubble.io"
     },
     "BugSnag": {