fix conflicts

Author: taylorotwell

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -36,6 +36,6 @@ public function store(Request $request): RedirectResponse
             $request->only('email')
         );
 
-        return back()->with('status', __('If an account exists with that email, you’ll receive a reset link shortly.'));
+        return back()->with('status', __('A reset link will be sent if the account exists.'));
     }
 }