# Conflicts: # application/src/main/java/org/thingsboard/server/controller/DeviceController.java # application/src/main/java/org/thingsboard/server/controller/EdgeController.java # common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java # ui-ngx/src/app/core/http/device.service.ts