# Conflicts: # pages/index/collectNotes/collectNotes.vue # pages/index/merchant-details/merchant-details.vue # pages/welcome/welcome.vue 1.解决冲突