fixed merge conflicts

resources/views/app/practice-management/cellular-device-manager.blade.php

@@ -8,7 +8,7 @@
 
                 @foreach($allPros as $_pro)
                     <div>
-                        <a href="{{ route('practice-management.hcpBillMatrix', $_pro) }}">
+                        <a href="{{ route('practice-management.cellularDeviceManager', $_pro) }}">
                             {{$_pro->name_last}}, {{$_pro->name_first}}
                         </a>
                     </div>