fix merge conflict

client/modules/IDE/components/About.jsx

@@ -72,7 +72,7 @@ function About(props) {
         </p>
         <p className="about__content-column-list">
           <a
-            href="https://forum.processing.org/two/"
+            href="https://discourse.processing.org/"
             target="_blank"
             rel="noopener noreferrer"
           >

client/utils/previewEntry.js

@@ -1,5 +1,5 @@
 import loopProtect from 'loop-protect';
-import Hook from 'console-feed/lib/Hook/index';
+import { Hook } from 'console-feed';
 
 window.loopProtect = loopProtect;