Fix merge conflicts

docs/internals/overview.mdx

@@ -7,4 +7,31 @@ This section covers the internals of Infisical including its technical underpinn
 
 <Note>
     Knowledge of this section is recommended but not required to use Infisical. However, if you're operating Infisical, we recommend understanding the internals.
-</Note>
+</Note>
+
+## Learn More
+
+<CardGroup cols={2}>
+  <Card href="./components" title="Components" icon="boxes-stacked" color="#3775a9">
+    Learn about the fundamental parts of Infisical
+  </Card>
+  <Card href="./flows" title="Flows" icon="bars-staggered" color="#0078d3">
+    Find out more about the structure of core user flows in Infisical
+  </Card>
+  <Card
+    href="./security"
+    title="Security"
+    icon="shield"
+    color="#3775a9"
+  >
+    Read about most common security-related topics and questions
+  </Card>
+  <Card
+    href="./service-tokens"
+    title="Service tokens"
+    icon="ticket"
+    color="#3775a9"
+  >
+    Learn best practices for utilizing Infisical sevrice tokens
+  </Card>
+</CardGroup>

docs/self-hosting/configuration/email.mdx

@@ -25,6 +25,36 @@ If you choose to setup email service, you need to configure the following SMTP [
 Below you will find details on how to configure common email providers:
 
 <AccordionGroup>
+<Accordion title="Resend">
+1. Create an account on [Resend](https://resend.com).
+2. Add a [Domain](https://resend.com/domains).
+
+![adding resend domain](../../images/email-resend-create-domain.png)
+
+3. Create an [API Key](https://resend.com/api-keys).
+
+![creating resend api key](../../images/email-resend-create-key.png)
+
+4. Go to the [SMTP page](https://resend.com/settings/smtp) and copy the values.
+
+![go to resend smtp settings](../../images/email-resend-smtp-settings.png)
+
+5. With the API Key, you can now set your SMTP environment variables variables:
+
+```
+SMTP_HOST=smtp.resend.com
+SMTP_USERNAME=resend
+SMTP_PASSWORD=YOUR_API_KEY
+SMTP_PORT=587
+SMTP_SECURE=true
+SMTP_FROM_ADDRESS=hey@example.com # your email address being used to send out emails
+SMTP_FROM_NAME=Infisical
+```
+  <Info>
+    Remember that you will need to restart Infisical for this to work properly.
+  </Info>
+</Accordion>
+
 <Accordion title="Twilio SendGrid">
 
 1. Create an account and configure [SendGrid](https://sendgrid.com) to send emails.