merge conflicts

Author: katherinek123

package-lock.json

@@ -49,8 +49,10 @@
     "vue-multiselect": "^3.0.0-alpha.2",
     "vue-prism-editor": "^2.0.0-alpha.2",
     "vue-router": "4.0.13",
+    "vue3-draggable-resizable": "^1.6.4",
     "vue3-tree": "^0.11.0",
     "vued3tree": "^5.1.0",
+    "vuedraggable": "^4.1.0",
     "vuex": "^4.0.2"
   },
   "devDependencies": {