diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 1d0aa58..f3d2011 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -7,6 +7,7 @@ import { Plus } from '@element-plus/icons-vue'
 </script>
 
 <template>
+<<<<<<< HEAD
   <div>
     新增充值
   </div>
@@ -83,6 +84,9 @@ import { Plus } from '@element-plus/icons-vue'
 <div>
   
 </div>
+=======
+    <h1>Add Recharge</h1>
+>>>>>>> 1779301c1263a097fb8b7b909a618d3670373ff6
 </template>
 
 <style scoped>