Some more merge issues fixed, fixed webpack watch

Extensions/combined/src/bar.js

@@ -1,8 +1,6 @@
 import { getButtons } from "./buttons";
-import { likesDisabledState, extConfig } from "./state";
+import { likesDisabledState, extConfig, isMobile } from "./state";
 import { cLog, getColorFromTheme } from "./utils";
-import { isMobile, likesDisabledState } from "./state";
-import { cLog } from "./utils";
 function createRateBar(likes, dislikes) {
   if (!likesDisabledState) {
     let rateBar = document.getElementById("ryd-bar-container");

Extensions/combined/src/utils.js

@@ -143,14 +143,6 @@ function getColorFromTheme(voteIsLike) {
   return colorString;
 }
 
-export {
-  numberFormat,
-  getBrowser,
-  getVideoId,
-  isVideoLoaded,
-  cLog,
-  getColorFromTheme,
-};
 export {
   numberFormat,
   getBrowser,
@@ -158,4 +150,5 @@ export {
   isInViewport,
   isVideoLoaded,
   cLog,
+  getColorFromTheme,
 };

webpack.config.js

@@ -23,7 +23,7 @@ module.exports = {
     minimize: false,
   },
   watchOptions: {
-    ignored: "./Extensions/combined/dist/*",
+    ignored: "**/dist/**",
   },
   plugins: [
     // exclude locale files in moment