# Conflicts: # App.vue # main.js # pages.json
# Conflicts: # pages/index/index.vue
# Conflicts: # package.json