diff --git a/es/checkers/order.js b/es/checkers/order.js
index 58007a5c..05f53674 100644
--- a/es/checkers/order.js
+++ b/es/checkers/order.js
@@ -97,17 +97,8 @@ const checkers = [
                 assert(['paid', 'partiallyRefunded'].includes(iState));
                 assert(settlements && settlements.length > 0, '该结算订单需添加结算明细');
                 let amount = 0;
-<<<<<<< HEAD
                 settlements.forEach((settlement) => {
                     amount += settlement.price;
-=======
-                opers.forEach(({ action, data }) => {
-                    assert(action === 'create');
-                    const { type, totalPlus, availPlus, refundablePlus } = data;
-                    assert(type === 'earn');
-                    // assert(totalPlus === availPlus);
-                    amount += totalPlus;
->>>>>>> build
                 });
                 assert(amount === paid - refunded);
             });
diff --git a/es/configuration/attrUpdateMatrix.js b/es/configuration/attrUpdateMatrix.js
index 4d217278..d24f8ebc 100644
--- a/es/configuration/attrUpdateMatrix.js
+++ b/es/configuration/attrUpdateMatrix.js
@@ -186,36 +186,21 @@ const attrUpdateMatrix = {
         taxLossRatio: {
             actions: ['update'],
         },
-<<<<<<< HEAD
         /* depositLossRatio: {
             actions: ['update'],
         }, */
-=======
-        // depositLossRatio: {
-        //     actions: ['update'],
-        // },
->>>>>>> build
         refundCompensateRatio: {
             actions: ['update'],
         },
         refundGapDays: {
             actions: ['update'],
         },
-<<<<<<< HEAD
         /* refundLossRatio: {
             actions: ['update'],
         },
         refundLossFloor: {
             actions: ['update'],
         },*/
-=======
-        // refundLossRatio: {
-        //     actions: ['update'],
-        // },
-        // refundLossFloor: {
-        //     actions: ['update'],
-        // },
->>>>>>> build
         publicKeyFilePath: {
             actions: ['update'],
         },
diff --git a/es/utils/payClazz/WechatPay/index.d.ts b/es/utils/payClazz/WechatPay/index.d.ts
index ce1d041a..eeba2b4b 100644
--- a/es/utils/payClazz/WechatPay/index.d.ts
+++ b/es/utils/payClazz/WechatPay/index.d.ts
@@ -1,4 +1,4 @@
 import WechatPay from './WechatPay';
 import WechatPayDebug from './WechatPay.debug';
-declare const _default: typeof WechatPay | typeof WechatPayDebug;
+declare const _default: typeof WechatPayDebug | typeof WechatPay;
 export default _default;
diff --git a/lib/checkers/order.js b/lib/checkers/order.js
index ac5ce125..44c3b974 100644
--- a/lib/checkers/order.js
+++ b/lib/checkers/order.js
@@ -100,17 +100,8 @@ const checkers = [
                 (0, assert_1.default)(['paid', 'partiallyRefunded'].includes(iState));
                 (0, assert_1.default)(settlements && settlements.length > 0, '该结算订单需添加结算明细');
                 let amount = 0;
-<<<<<<< HEAD
                 settlements.forEach((settlement) => {
                     amount += settlement.price;
-=======
-                opers.forEach(({ action, data }) => {
-                    (0, assert_1.default)(action === 'create');
-                    const { type, totalPlus, availPlus, refundablePlus } = data;
-                    (0, assert_1.default)(type === 'earn');
-                    // (0, assert_1.default)(totalPlus === availPlus);
-                    amount += totalPlus;
->>>>>>> build
                 });
                 (0, assert_1.default)(amount === paid - refunded);
             });
diff --git a/lib/utils/payClazz/WechatPay/index.d.ts b/lib/utils/payClazz/WechatPay/index.d.ts
index ce1d041a..eeba2b4b 100644
--- a/lib/utils/payClazz/WechatPay/index.d.ts
+++ b/lib/utils/payClazz/WechatPay/index.d.ts
@@ -1,4 +1,4 @@
 import WechatPay from './WechatPay';
 import WechatPayDebug from './WechatPay.debug';
-declare const _default: typeof WechatPay | typeof WechatPayDebug;
+declare const _default: typeof WechatPayDebug | typeof WechatPay;
 export default _default;
diff --git a/lib/utils/wpProductFrontend.js b/lib/utils/wpProductFrontend.js
index 91423360..25f8a634 100644
--- a/lib/utils/wpProductFrontend.js
+++ b/lib/utils/wpProductFrontend.js
@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWpProductTypeFromEnv = getWpProductTypeFromEnv;
-exports.canStartPay = canStartPay;
+exports.canStartPay = exports.getWpProductTypeFromEnv = void 0;
 const utils_1 = require("oak-frontend-base/es/utils/utils");
 function getWpProductTypeFromEnv() {
     switch (process.env.OAK_PLATFORM) {
@@ -24,6 +23,7 @@ function getWpProductTypeFromEnv() {
     }
     return [];
 }
+exports.getWpProductTypeFromEnv = getWpProductTypeFromEnv;
 function canStartPay(pay, features) {
     const { applicationId, wpProduct } = pay;
     if (features.application.getApplicationId() !== applicationId) {
@@ -32,3 +32,4 @@ function canStartPay(pay, features) {
     const types = getWpProductTypeFromEnv();
     return types.includes(wpProduct.type) && wpProduct.type !== 'native';
 }
+exports.canStartPay = canStartPay;