Fixing compilation issues.

FirebaseMessaging.podspec

@@ -37,12 +37,9 @@ device, and it is completely free.
 
   base_dir = "FirebaseMessaging/"
   s.source_files = [
-<<<<<<< HEAD
     base_dir + 'Sources/**/*',
     base_dir + 'Sources/LiveActivities/*.{swift,h,m}',
-=======
     base_dir + 'Sources/**/*.{c,m,h}',
->>>>>>> main
     base_dir + 'Sources/Protogen/nanopb/*.h',
     base_dir + 'Interop/*.h',
     'Interop/Analytics/Public/*.h',

FirebaseMessaging/Apps/AdvancedSample/Podfile

@@ -29,7 +29,7 @@ target 'AppClips' do
 end
 
 target 'SampleWatchWatchKitExtension' do
-  platform :watchos, '6.0'
+  platform :watchos, '7.0'
   shared_pods
 end