# Conflicts: # src/views/home/index.vue
Pay See merge request !4
# Conflicts: # src/views/vipLife/index.vue
Feat/vip life See merge request !3