resove conflit

lib/app.dart

@@ -1,4 +1,5 @@
 import 'package:fcs/model/shipment_model.dart';
+import 'package:fcs/model_fcs/package_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
@@ -65,6 +66,8 @@ class _AppState extends State<App> {
   final PickUpModel pickUpModel = new PickUpModel();
   final ShipmentRateModel shipmentRateModel = new ShipmentRateModel();
   final ShipmentModel shipmentModel = new ShipmentModel();
+  final PackageModel packageModel=new PackageModel();
+
 
   AppTranslationsDelegate _newLocaleDelegate;
 
@@ -97,7 +100,9 @@ class _AppState extends State<App> {
       ..addModel(reportUserModel)
       ..addModel(pickUpModel)
       ..addModel(shipmentRateModel)
-      ..addModel(shipmentModel);
+      ..addModel(shipmentModel)
+      ..addModel(packageModel)
+      ..addModel(shipmentRateModel);
     this.mainModel.init();
   }
 
@@ -149,6 +154,7 @@ class _AppState extends State<App> {
         ChangeNotifierProvider(builder: (context) => pickUpModel),
         ChangeNotifierProvider(builder: (context) => shipmentRateModel),
         ChangeNotifierProvider(builder: (context) => shipmentModel),
+        ChangeNotifierProvider(builder: (context) => packageModel),
         ChangeNotifierProvider(
           builder: (context) => testModel,
         ),