fix merge conflicts

Author: habibayman

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue

@@ -205,6 +205,7 @@
         openAnswerIdx: null,
         kindSelectKey: 0,
         AssessmentItemTypes,
+        EditorImageProcessor,
       };
     },
     computed: {

contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/image/ImageNodeView.vue

@@ -86,7 +86,6 @@
       const naturalAspectRatio = ref(null);
       const minWidth = 50;
       const compactThreshold = 200;
-      const debounceTimer = null;
       let resizeListeners = null;
 
       // Create debounced version of saveSize function

contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useModalPositioning.js

@@ -8,9 +8,6 @@ export function useModalPositioning() {
   const isModalCentered = ref(false);
   const anchorElement = ref(null);
 
-  let scrollRaf = null;
-  let resizeRaf = null;
-
   const updatePosition = () => {
     if (!anchorElement.value || isModalCentered.value || isTouchDevice) {
       return;