fixed merge conflicts

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

@@ -87,7 +87,7 @@
                     </tbody>
                 </table>
                 <div>
-                    {{$bills->links()}}
+                    {{$clients->links()}}
                 </div>
             </div>
         </div>