Conflicts: app.json
# Conflicts: # utils/API.js
Conflicts: utils/API.js
Conflicts: pages/inCome/inCome.wxml