diff --git a/node_modules/vue-plugin-hiprint/dist/vue-plugin-hiprint.js b/node_modules/vue-plugin-hiprint/dist/vue-plugin-hiprint.js
index 5b0506a..c023199 100644
--- a/node_modules/vue-plugin-hiprint/dist/vue-plugin-hiprint.js
+++ b/node_modules/vue-plugin-hiprint/dist/vue-plugin-hiprint.js
@@ -7466,18 +7466,10 @@
               }, t.prototype.mathroundToporleft = function (t) {
                 var e = p.a.instance.movingDistance;
                 return Math.round(t / e) * e
-<<<<<<< HEAD
               }, t.prototype.appendDesignPrintElement = function (t, e, i) {
                 e.setCurrenttemplateData(void 0);
                 var n = e.getDesignTarget(t);
                 n.addClass("design"), i && e.initSizeByHtml(n), t.append(n)
-=======
-              }, t.prototype.appendDesignPrintElement = function (t, e, i, className) {
-                e.setCurrenttemplateData(void 0);
-                var n = e.getDesignTarget(t);
-                const isAddClass = !!e.options.field
-                n.addClass(`design ${isAddClass ? 'dynamicField' : ''}`), i && e.initSizeByHtml(n), t.append(n)
->>>>>>> 4b6e221369194b3387a0e3c28135acd3736c1bcd
               }, t.prototype.createNewPage = function (t, e) {
                 t = new T(this.templateId, this.index, this.watermarkOptions, this.panelPageRule, this.scale, this.width, this.height, this.paperHeader, this.paperFooter, this.paperNumberLeft, this.paperNumberTop, this.paperNumberDisabled, this.paperNumberContinue, this.paperNumberFormat, t, e);
                 return t.setFooter(this.firstPaperFooter, this.evenPaperFooter, this.oddPaperFooter, this.lastPaperFooter), t.setOffset(this.leftOffset, this.topOffset), t