diff --git a/jiuyi2/api/durian.js b/jiuyi2/api/durian.js
index 247cd4fc..5d3201ee 100644
--- a/jiuyi2/api/durian.js
+++ b/jiuyi2/api/durian.js
@@ -73,7 +73,6 @@ export const durian = {
 			load: true,
 		})
 	},
-<<<<<<< HEAD
 	/**
 	 * 榴莲果配置
 	 * @param {Object} param
@@ -82,8 +81,8 @@ export const durian = {
 		return util.request({
 			url: `/coreplay/durianFruitTransactionType/10`,
 			method: 'GET',
-=======
-
+		})
+	},
 	/**
 	 * 获取榴莲果兑换播放量比例
 	 * @param {Object} param
@@ -93,7 +92,6 @@ export const durian = {
 			url: `/coreplay/durianFruitTransactionType/5`,
 			method: 'GET',
 			data: param.data,
->>>>>>> e13df4169078e5739567f80dd1d8caae214e4c7f
 		})
 	},
 }