merge conflict resolved.

lib/new_views/pages/land_page/land_page.dart

@@ -106,7 +106,7 @@ class _LandPageState extends State<LandPage> {
       if (_userProvider!.user != null && _userProvider!.user!.employeeIsHMG == false) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           _userProvider!.getSwipeLastTransaction(userId: _userProvider!.user!.userID!);
-          Provider.of<VendorProvider>(context, listen: false).getDate();
+          Provider.of<VendorProvider>(context, listen: false).getData();
         });
       }
       _pages = <Widget>[

lib/providers/work_order/wo_frame_provider.dart

@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class WoFrameProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getDate() async {
+  Future getData() async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();