diff --git a/pubspec.yaml b/pubspec.yaml
index 3889750..ea63090 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -43,11 +43,7 @@ dependencies:
   flutter_pdfview: ^1.2.1
   open_file: ^3.2.1
   lottie: ^1.2.2
-<<<<<<< HEAD
-  camera: ^0.9.4+20
-=======
   camera: ^0.9.4+21
->>>>>>> 67c44e3b04a33b360d1dedb2e2f5b475d23cf1e8
   share_plus: ^3.0.4
   facebook_audience_network: ^1.0.1
   local_auth: ^1.1.11
@@ -107,4 +103,4 @@ flutter:
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
 flutter_native_splash:
-  background_image: "assets/splash.png"
\ No newline at end of file
+  background_image: "assets/splash.png"