diff --git a/docker/containers/tactical-nginx/entrypoint.sh b/docker/containers/tactical-nginx/entrypoint.sh
index 528b595047..227c152d41 100644
--- a/docker/containers/tactical-nginx/entrypoint.sh
+++ b/docker/containers/tactical-nginx/entrypoint.sh
@@ -168,8 +168,12 @@ server {
 
     location / {
         #Using variable to disable start checks
+<<<<<<< HEAD
 <<<<<<< HEAD
         set \$meshcentral http://{$MESH_SERVICE}:443;
+=======
+        set \$meshcentral http://${MESH_SERVICE}:443;
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 =======
         set \$meshcentral http://${MESH_SERVICE}:443;
 >>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
diff --git a/web/src/components/agents/AgentActionMenu.vue b/web/src/components/agents/AgentActionMenu.vue
index 844c0029f7..88feb67c71 100644
--- a/web/src/components/agents/AgentActionMenu.vue
+++ b/web/src/components/agents/AgentActionMenu.vue
@@ -47,6 +47,7 @@
       </q-menu>
     </q-item>
 
+<<<<<<< HEAD
     <!-- integrations -->
     <q-item clickable v-close-popup @click="getAgentIntegrations(agent)">
       <q-item-section side>
@@ -55,12 +56,18 @@
       <q-item-section>Integrations</q-item-section>
     </q-item>
 
+=======
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
     <q-item clickable v-ripple v-close-popup @click="showSendCommand(agent)">
       <q-item-section side>
         <q-icon size="xs" name="fas fa-terminal" />
       </q-item-section>
       <q-item-section>Send Command</q-item-section>
     </q-item>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
     <q-item clickable v-ripple v-close-popup @click="showRunScript(agent)">
       <q-item-section side>
         <q-icon size="xs" name="fas fa-terminal" />
@@ -190,7 +197,10 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import axios from "axios";
+=======
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 // composition imports
 import { ref, inject } from "vue";
 import { useStore } from "vuex";
@@ -217,7 +227,10 @@ import RebootLater from "@/components/modals/agents/RebootLater";
 import EditAgent from "@/components/modals/agents/EditAgent";
 import SendCommand from "@/components/modals/agents/SendCommand";
 import RunScript from "@/components/modals/agents/RunScript";
+<<<<<<< HEAD
 import AgentIntegrations from "@/components/modals/agents/AgentIntegrations";
+=======
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 
 export default {
   name: "AgentActionMenu",
@@ -446,6 +459,7 @@ export default {
         }
       });
     }
+<<<<<<< HEAD
     function getAgentIntegrations(agent) {
       axios
           .get("agents/" + props.agent.agent_id + "/")
@@ -480,11 +494,17 @@ export default {
               console.log(e)
           });
     }
+=======
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 
     return {
       // reactive data
       urlActions,
       favoriteScripts,
+<<<<<<< HEAD
+=======
+
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
       // methods
       showEditAgent,
       showPendingActionsModal,
@@ -492,7 +512,10 @@ export default {
       runRemoteBackground,
       getURLActions,
       runURLAction,
+<<<<<<< HEAD
       getAgentIntegrations,
+=======
+>>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
       showSendCommand,
       showRunScript,
       getFavoriteScripts,