diff --git a/lib/pages/carton/carton_info.dart b/lib/pages/carton/carton_info.dart
index f3359c3..111d061 100644
--- a/lib/pages/carton/carton_info.dart
+++ b/lib/pages/carton/carton_info.dart
@@ -175,19 +175,11 @@ class _CartonInfoState extends State<CartonInfo> {
       labelTextKey: "box.number",
       //iconData: Ionicons.ios_airplane,
     );
-<<<<<<< HEAD
     final cartonQrBox = DisplayText(
       // text: _box!.,
       //labelTextKey: "box.number",
       iconData: AntDesign.qrcode,
     );
-=======
-    // final cartonQrBox = DisplayText(
-    //  // text: _box!.,
-    //   //labelTextKey: "box.number",
-    //   iconData: AntDesign.qrcode,
-    // );
->>>>>>> 9bd0c5d484c580feff721ff039b506f107dcb314
     final shipmentBox = DisplayText(
       text: _box!.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",