diff --git a/pubspec.lock b/pubspec.lock
index 68d7f4e0..9b4511ab 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -36,8 +36,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.1"
-<<<<<<< HEAD
-=======
   barcode_scan:
     dependency: "direct main"
     description:
@@ -45,7 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
->>>>>>> 8f56c5104af4e78067c70eb1e034615f45fcf6fc
   bazel_worker:
     dependency: transitive
     description: