Additional merge conflict fixes

src/main.less

@@ -20,6 +20,10 @@
     line-height: 1em !important;
   }
 
+  div.qv-object-content-container {
+    z-index: 110;
+  }
+
   .tooltip-wrapper {
     min-width: 25px;
     position: fixed;

src/paint.jsx

@@ -1,4 +1,3 @@
-import $ from 'jquery'; // eslint-disable-line id-length
 import initializeStore from './store';
 import React from 'react';
 import ReactDOM from 'react-dom';