diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index a2f7194..cc0815b 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -662,12 +662,9 @@
 					picturesAndTables: '',
 					totalpage: '',
 					manuscirpt: '',
-<<<<<<< HEAD
 					supplementary: '',
 					code: ''
-=======
 					topics:null
->>>>>>> remotes/origin/xie
 				},
 				journal_type: [{
 					name: 'ARTICLE',