# Conflicts: # server/database.js # server/model/monitor.js # server/server.js # server/util-server.js # src/pages/EditMonitor.vue