diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 7e45e524a50d2a1cd44785efcffa8e8d6369ff65..05e3769fa96b75c92e5f9d7da34c363eb9bbea20 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -56,13 +56,8 @@ const Hhmi = () => {
         config={config}
         autoFocus
         fileUpload={file => renderImage(file)}
-<<<<<<< HEAD
-        value=""
-        // targetFormat="JSON"
-=======
         value={initialValue}
         targetFormat="JSON"
->>>>>>> create editor
         // readonly
         layout={HhmiLayout}
         onChange={source => console.log(source)}
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index e4422c4c7b419a999860b08c9cb0cf3036260a74..cc9ff4c5b5ef13fac51be45bd50fadf3897b3de5 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -57,6 +57,7 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
   }
 
   update(node) {
+<<<<<<< HEAD
     if (!node.sameMarkup(this.node)) return false;
     this.node = node;
     if (this.innerView) {
@@ -76,6 +77,9 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
         );
       }
     }
+=======
+    console.log('in nodes update');
+>>>>>>> fix
     return true;
   }
 }
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
index fbc0d58cd57074f4e34fe4332d0c8d05c704af1b..5130338c1fd8c9f9aefe1bd3f9c6561238aa0f33 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
@@ -24,17 +24,14 @@ const EditorWrapper = styled.div`
   user-select: all;
 `;
 
-
 export default ({ node, view, getPos }) => {
   const [showExplanation, setShowExplanation] = useState(false);
- }
 
   const clickMe = () => {
     setShowExplanation(true);
     // view.dispatch(view.state.tr);
   };
 
-;
   return (
     <>
       <button onClick={clickMe}>Show Explanation</button>
diff --git a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
index 214ef693a7f32e6797e4ab9081e06f1aced8ed4d..9600620374f8d814c397c8236b2121b6c8bf9bd2 100644
--- a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
+++ b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
@@ -4,10 +4,13 @@ export default class AbstractNodeView {
   constructor(node, view, getPos, decorations, createPortal, Component) {
     this.dom = document.createElement('div');
     // this.dom.setAttribute('contenteditable', true);
+<<<<<<< HEAD
     const testDiv = document.createElement('div');
 
     testDiv.setAttribute('id', 'test');
     this.dom.append(testDiv);
+=======
+>>>>>>> fix
     this.dom.id = uuidv4();
     this.dom.classList.add('portal');