diff --git a/frontend/components/Layout/LayoutParts/AppFooter.vue b/frontend/components/Layout/LayoutParts/AppFooter.vue
index 0dff4016260..a25d3e18fd8 100644
--- a/frontend/components/Layout/LayoutParts/AppFooter.vue
+++ b/frontend/components/Layout/LayoutParts/AppFooter.vue
@@ -2,11 +2,7 @@
   <v-footer color="primary" padless app>
     <v-row justify="center" align="center" dense no-gutters>
       <v-col class="py-2 text-center white--text" cols="12">
-<<<<<<< HEAD
-        <v-btn color="white" icon href="https://github.com/ATommasi/arcane-recipes" target="_blank">
-=======
         <v-btn color="white" icon href="https://github.com/atommasi/arcane-recipes" target="_blank">
->>>>>>> 2236945ae07b2c7129bf77ced77f307e3d8a5586
           <v-icon>
             {{ $globals.icons.github }}
           </v-icon>
diff --git a/mealie/services/email/templates/default.html b/mealie/services/email/templates/default.html
index cd6f35bd81f..04c4771bb7a 100644
--- a/mealie/services/email/templates/default.html
+++ b/mealie/services/email/templates/default.html
@@ -369,7 +369,7 @@ <h2>{{ data.header_text }}</h2>
 
                           <!--[if mso | IE]></td><td style="padding:15px 10px;" class="" ><![endif]-->
 
-                          <a class="mj-link" href="https://discord.gg/PfByzb5EKH" target="_blank" style="
+                          <a class="mj-link" href="https://arcanetechsolutions.com" target="_blank" style="
                                 display: inline-block;
                                 color: #dd8333;
                                 font-family: Roboto, Helvetica Neue, Helvetica,
@@ -381,7 +381,7 @@ <h2>{{ data.header_text }}</h2>
                                 text-transform: uppercase;
                                 padding: 15px 10px;
                               ">
-                            Discord
+                            Arcane Tech Solutions
                           </a>
 
                           <!--[if mso | IE]></td><td style="padding:15px 10px;" class="" ><![endif]-->