diff --git a/config/services.php b/config/services.php
index 126d810..dd4933b 100644
--- a/config/services.php
+++ b/config/services.php
@@ -30,6 +30,7 @@ return [
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
+<<<<<<< HEAD
 
     'google_recaptcha' => [
         'url' => 'https://www.google.com/recaptcha/api/siteverify',
@@ -37,4 +38,6 @@ return [
         'secret_key' => env('GOOGLE_RECAPTCHA_SECRET_SITE_KEY'),
     ],
 
+=======
+>>>>>>> 086cf9e (removed obsolete recaptcha)
 ];