Fixed merge issues

Author: gwinnem

sandbox/App.vue

@@ -262,8 +262,8 @@ const isDraggable = ref(true);
 const isMirrored = ref(false);
 const isResizable = ref(true);
 const isResponsive = ref(true);
-const marginLeftRight = ref(0);
-const marginTopBottom = ref(0);
+const marginLeftRight = ref(10);
+const marginTopBottom = ref(10);
 const maxRows = ref(10);
 const preserveAspectRatio = ref(false);
 const preventCollision = ref(false);