# Conflicts: # package-lock.json # package.json # public/api.js # src/App.js # src/index.js # src/router/router-config.js # src/utils/index.js
