Resolved merge conflicts

Author: M7DEVIP

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # chicken_express_driver
 
 A new Flutter project.
@@ -14,3 +15,6 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+=======
+# CHICKEN-EXPRESS-driver
+>>>>>>> 6b7840880b1765568492fa076f34cbfd39e2af1c