diff --git a/pages/pallet/js.vue b/pages/pallet/js.vue
index 971cf38..c0aa3db 100644
--- a/pages/pallet/js.vue
+++ b/pages/pallet/js.vue
@@ -386,10 +386,7 @@ export default {
 				// console.log(Compressor)
 		       const Compressor1 = new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
-<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
-=======
->>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 					// console.log("compressedFile",compressedFile)
 		          // 读取压缩后的图片文件为base64
diff --git a/pages/pallet/ps.vue b/pages/pallet/ps.vue
index a92508a..967723c 100644
--- a/pages/pallet/ps.vue
+++ b/pages/pallet/ps.vue
@@ -601,10 +601,7 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
-<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
-=======
->>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
@@ -693,10 +690,7 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
-<<<<<<< HEAD
 				convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
-=======
->>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
diff --git a/pages/pallet/xp.vue b/pages/pallet/xp.vue
index 477f726..b18d260 100644
--- a/pages/pallet/xp.vue
+++ b/pages/pallet/xp.vue
@@ -392,10 +392,7 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
-<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
-=======
->>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();
diff --git a/pages/pallet/yz.vue b/pages/pallet/yz.vue
index 50e8929..6444d78 100644
--- a/pages/pallet/yz.vue
+++ b/pages/pallet/yz.vue
@@ -454,10 +454,7 @@ export default {
 			return new Promise((resolve, reject) => {
 		      new Compressor(file, {
 		        quality: 0.3, // 压缩质量，范围是0-1
-<<<<<<< HEAD
 		        convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小，单位是字节。如果图片大小小于这个值，则不进行压缩。
-=======
->>>>>>> e53878004c989de2e23cc181dc0c247667489fee
 		        success: (compressedFile) => {
 		          // 读取压缩后的图片文件为base64
 		          const reader = new FileReader();