Added text to DeviceReportController.php
Fixed merge conflict in DeviceReportController.php