diff --git a/docs/src/ai/edit-prediction.md b/docs/src/ai/edit-prediction.md
index 7628223a6beeb83f1f4901566e819323fe9b3ff7..e756116458b517dcb83cca4a87a20f128595a0bb 100644
--- a/docs/src/ai/edit-prediction.md
+++ b/docs/src/ai/edit-prediction.md
@@ -349,7 +349,8 @@ You should be able to sign-in to Supermaven by clicking on the Supermaven icon i
 To use Mistral's Codestral as your provider:
 =======
 To use Mistral's Codestral as your provider, you can configure it through the Settings UI. Open the Settings Editor with {#kb zed::OpenSettings}, navigate to **AI > Edit Predictions**, and configure your Codestral API key in the provider settings.
->>>>>>> Stashed changes
+
+> > > > > > > Stashed changes
 
 1. Open the Settings Editor (`Cmd+,` on macOS, `Ctrl+,` on Linux/Windows)
 2. Search for "Edit Predictions" and click **Configure Providers**