diff --git a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
index 9600620374f8d814c397c8236b2121b6c8bf9bd2..19df6c1181a324b4e3cda3c1c2273982668425c7 100644
--- a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
+++ b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
@@ -3,14 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
 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');