diff --git a/api/tacticalrmm/autotasks/models.py b/api/tacticalrmm/autotasks/models.py
index b78e3448ec..f2bd5ed2e5 100644
--- a/api/tacticalrmm/autotasks/models.py
+++ b/api/tacticalrmm/autotasks/models.py
@@ -92,13 +92,8 @@ class AutomatedTask(BaseAuditModel):
     # deprecated
     timeout = models.PositiveIntegerField(blank=True, default=120)
 
-<<<<<<< HEAD
     # format -> {"actions": [{"type": "script", "script": 1, "name": "Script Name", "timeout": 90, "script_args": []}, {"type": "cmd", "command": "whoami", "timeout": 90}]}
     actions = JSONField(default=list)
-=======
-    # format -> {"actions": [{"type": "script", "pk": 1, "shell": "powershell", "timeout": 90, "script_args": []}, {"type": "cmd", "command": "whoami"}]}
-    actions = JSONField(default=dict)
->>>>>>> massive cleanup of files and restructure of integrations design
     assigned_check = models.ForeignKey(
         "checks.Check",
         null=True,
@@ -366,13 +361,9 @@ def generate_nats_task_payload(self, editing=False):
             "multiple_instances": self.task_instance_policy
             if self.task_instance_policy
             else 0,
-<<<<<<< HEAD
             "delete_expired_task_after": self.remove_if_not_scheduled
             if self.expire_date
             else False,
-=======
-            "delete_expired_task_after": self.remove_if_not_scheduled,
->>>>>>> massive cleanup of files and restructure of integrations design
             "start_when_available": self.run_asap_after_missed
             if self.task_type != "runonce"
             else True,
diff --git a/api/tacticalrmm/autotasks/serializers.py b/api/tacticalrmm/autotasks/serializers.py
index b632b135bc..5153486902 100644
--- a/api/tacticalrmm/autotasks/serializers.py
+++ b/api/tacticalrmm/autotasks/serializers.py
@@ -11,7 +11,6 @@ class TaskSerializer(serializers.ModelSerializer):
     schedule = serializers.ReadOnlyField()
     last_run = serializers.ReadOnlyField(source="last_run_as_timezone")
     alert_template = serializers.SerializerMethodField()
-<<<<<<< HEAD
     run_time_date = serializers.DateTimeField(format="iso-8601", required=False)
     expire_date = serializers.DateTimeField(
         format="iso-8601", allow_null=True, required=False
@@ -83,14 +82,6 @@ def validate(self, data):
                 del data["monthly_weeks_of_month"]
             if "assigned_check" in data:
                 del data["assigned_check"]
-=======
-    run_time_date = serializers.DateTimeField(format="iso-8601")
-    expire_date = serializers.DateTimeField(format="iso-8601", allow_null=True)
-
-    def validate(self, data):
-
-        if "task_type" not in data:
->>>>>>> massive cleanup of files and restructure of integrations design
             return data
 
         # run_time_date required
@@ -104,104 +95,64 @@ def validate(self, data):
 
         # daily task type validation
         if data["task_type"] == "daily":
-<<<<<<< HEAD
             if "daily_interval" not in data or not data["daily_interval"]:
-=======
-            if not data["daily_interval"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"daily_interval is required for task_type '{data['task_type']}'"
                 )
 
         # weekly task type validation
-<<<<<<< HEAD
         elif data["task_type"] == "weekly":
             if "weekly_interval" not in data or not data["weekly_interval"]:
-=======
-        if data["task_type"] == "weekly":
-            if not data["weekly_interval"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"weekly_interval is required for task_type '{data['task_type']}'"
                 )
 
-<<<<<<< HEAD
             if "run_time_bit_weekdays" not in data or not data["run_time_bit_weekdays"]:
-=======
-            if not data["run_time_bit_weekdays"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"run_time_bit_weekdays is required for task_type '{data['task_type']}'"
                 )
 
         # monthly task type validation
-<<<<<<< HEAD
         elif data["task_type"] == "monthly":
             if (
                 "monthly_months_of_year" not in data
                 or not data["monthly_months_of_year"]
             ):
-=======
-        if data["task_type"] == "monthly":
-            if not data["monthly_months_of_year"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"monthly_months_of_year is required for task_type '{data['task_type']}'"
                 )
 
-<<<<<<< HEAD
             if "monthly_days_of_month" not in data or not data["monthly_days_of_month"]:
-=======
-            if not data["monthly_days_of_month"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"monthly_days_of_month is required for task_type '{data['task_type']}'"
                 )
 
         # monthly day of week task type validation
-<<<<<<< HEAD
         elif data["task_type"] == "monthlydow":
             if (
                 "monthly_months_of_year" not in data
                 or not data["monthly_months_of_year"]
             ):
-=======
-        if data["task_type"] == "monthlydow":
-            if not data["monthly_months_of_year"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"monthly_months_of_year is required for task_type '{data['task_type']}'"
                 )
 
-<<<<<<< HEAD
             if (
                 "monthly_weeks_of_month" not in data
                 or not data["monthly_weeks_of_month"]
             ):
-=======
-            if not data["monthly_weeks_of_month"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"monthly_weeks_of_month is required for task_type '{data['task_type']}'"
                 )
 
-<<<<<<< HEAD
             if "run_time_bit_weekdays" not in data or not data["run_time_bit_weekdays"]:
-=======
-            if not data["run_time_bit_weekdays"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"run_time_bit_weekdays is required for task_type '{data['task_type']}'"
                 )
 
         # check failure task type validation
-<<<<<<< HEAD
         elif data["task_type"] == "checkfailure":
             if "assigned_check" not in data or not data["assigned_check"]:
-=======
-        if data["task_type"] == "checkfailure":
-            if not data["assigned_check"]:
->>>>>>> massive cleanup of files and restructure of integrations design
                 raise serializers.ValidationError(
                     f"assigned_check is required for task_type '{data['task_type']}'"
                 )
diff --git a/api/tacticalrmm/integrations/meraki/urls.py b/api/tacticalrmm/integrations/meraki/urls.py
index 9d50734706..417021255a 100644
--- a/api/tacticalrmm/integrations/meraki/urls.py
+++ b/api/tacticalrmm/integrations/meraki/urls.py
@@ -8,10 +8,7 @@
     path('<str:pk>/devices_summary/<str:timespan>/', views.GetDevicesSummary.as_view()),
     path('<str:pk>/networks/uplinks/', views.GetNetworkUplinks.as_view()),
     path('<str:pk>/top_clients/<str:timespan>/', views.GetTopClients.as_view()),
-<<<<<<< HEAD
-=======
     path('<str:pk>/client/<str:mac>/', views.GetClient.as_view()),
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
     path('<str:network_id>/applications/traffic/<str:timespan>/', views.GetNetworkApplicationTraffic.as_view()),
     path('<str:network_id>/clients/traffic/<str:timespan>/', views.GetNetworkClientTraffic.as_view()),
     path('<str:network_id>/clients/<str:client_mac>/policy/', views.GetClientPolicy.as_view()),
diff --git a/api/tacticalrmm/integrations/meraki/views.py b/api/tacticalrmm/integrations/meraki/views.py
index 46f7ec8547..a932f7f51f 100644
--- a/api/tacticalrmm/integrations/meraki/views.py
+++ b/api/tacticalrmm/integrations/meraki/views.py
@@ -7,15 +7,6 @@
 
 class GetOrganizations(APIView):
     permission_classes = [IsAuthenticated]
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-    
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-    
->>>>>>> allow Meraki integration dashboard at client level as well as agent
     def get(self, request, format=None):
         integration = Integration.objects.get(name="Cisco Meraki")
 
@@ -126,8 +117,7 @@ def get(self, request, pk, timespan, format=None):
 
         return Response(result)
 
-<<<<<<< HEAD
-=======
+
 class GetClient(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -146,9 +136,7 @@ def get(self, request, pk, mac, format=None):
             return Response(result)
         except ValueError:
             return Response()
-        
 
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
 class GetNetworkApplicationTraffic(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -215,11 +203,6 @@ def put(self, request, network_id, client_mac, format=None):
         integration = Integration.objects.get(name="Cisco Meraki")
 
         request_dict = {"devicePolicy": request.data['devicePolicy']}
-<<<<<<< HEAD
-        print(request.data)
-=======
-
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
         payload = json.dumps(request_dict, indent=4)
 
         result = requests.put(
diff --git a/api/tacticalrmm/integrations/models.py b/api/tacticalrmm/integrations/models.py
index af27cd936a..67661d11cc 100644
--- a/api/tacticalrmm/integrations/models.py
+++ b/api/tacticalrmm/integrations/models.py
@@ -7,14 +7,7 @@ class Integration(models.Model):
     configuration = models.JSONField(null=True, blank=True)
     data = models.JSONField(null=True, blank=True)
     enabled = models.BooleanField(default=False)
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     client_org_related = models.BooleanField(default=False)
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-    client_org_related = models.BooleanField(default=False)
->>>>>>> allow Meraki integration dashboard at client level as well as agent
 
     def __str__(self):
         return self.name
diff --git a/api/tacticalrmm/integrations/serializers.py b/api/tacticalrmm/integrations/serializers.py
index b270e8efaa..34e218b2b6 100644
--- a/api/tacticalrmm/integrations/serializers.py
+++ b/api/tacticalrmm/integrations/serializers.py
@@ -5,25 +5,9 @@
 class GetIntegrationsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Integration
-<<<<<<< HEAD
-<<<<<<< HEAD
-        fields = ('id', 'name', 'description', 'configuration', 'enabled')
-=======
         fields = ('id', 'name', 'description', 'configuration', 'enabled', 'client_org_related')
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-        fields = ('id', 'name', 'description', 'configuration', 'enabled', 'client_org_related')
->>>>>>> allow Meraki integration dashboard at client level as well as agent
 
 class GetIntegrationSerializer(serializers.ModelSerializer):
     class Meta:
         model = Integration
-<<<<<<< HEAD
-<<<<<<< HEAD
-        fields = ('id', 'name', 'description', 'configuration', 'enabled')
-=======
-        fields = ('id', 'name', 'description', 'configuration', 'enabled', 'client_org_related')
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
         fields = ('id', 'name', 'description', 'configuration', 'enabled', 'client_org_related')
->>>>>>> allow Meraki integration dashboard at client level as well as agent
diff --git a/api/tacticalrmm/integrations/snipeit/views.py b/api/tacticalrmm/integrations/snipeit/views.py
index 840d98508d..97189051ed 100644
--- a/api/tacticalrmm/integrations/snipeit/views.py
+++ b/api/tacticalrmm/integrations/snipeit/views.py
@@ -96,13 +96,7 @@ def delete(self, request, asset_id, format=None):
 
         result = requests.delete(
             integration.base_url + "hardware/" + asset_id,
-<<<<<<< HEAD
-<<<<<<< HEAD
-            json=payload,
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> checkin/checkout and delete asset
+
             headers={
                 "Accept": "application/json",
                 "Content-Type": "application/json",
@@ -140,15 +134,7 @@ def post(self, request, asset_id, format=None):
         payload = {
             "id": asset_id,
             "checkout_to_type": request.data['checkout_to_type'],
-<<<<<<< HEAD
-<<<<<<< HEAD
-            "assigned_user": 3,
-=======
-            "assigned_user": request.data['assigned_user'],
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
             "assigned_user": request.data['assigned_user'],
->>>>>>> allow Meraki integration dashboard at client level as well as agent
             "checkout_at": request.data['checkout_at'],
             "expected_checkin": request.data['expected_checkin'],
             "note": request.data['note']
diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index 7925c0cb36..f84d3600a8 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -24,11 +24,7 @@
 # https://github.com/wh1te909/rmmagent
 LATEST_AGENT_VER = "1.7.2"
 
-<<<<<<< HEAD
 MESH_VER = "0.9.66"
-=======
-MESH_VER = "0.9.65"
->>>>>>> massive cleanup of files and restructure of integrations design
 
 NATS_SERVER_VER = "2.6.6"
 
diff --git a/web/src/components/agents/AgentActionMenu.vue b/web/src/components/agents/AgentActionMenu.vue
index c7756ad27a..04a8bd771c 100644
--- a/web/src/components/agents/AgentActionMenu.vue
+++ b/web/src/components/agents/AgentActionMenu.vue
@@ -47,64 +47,20 @@
       </q-menu>
     </q-item>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> resolve conflicts
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> resolve final conflicts
     <!-- integrations -->
     <q-item clickable v-close-popup @click="getAgentIntegrations(agent)">
       <q-item-section side>
         <q-icon size="xs" name="vertical_split" />
       </q-item-section>
       <q-item-section>Integrations</q-item-section>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    </q-item>
-=======
-    </q-item> 
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
->>>>>>> resolve conflicts
-=======
     </q-item> 
 
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> resolve final conflicts
     <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
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
-
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> resolve final conflicts
     <q-item clickable v-ripple v-close-popup @click="showRunScript(agent)">
       <q-item-section side>
         <q-icon size="xs" name="fas fa-terminal" />
@@ -234,25 +190,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-import axios from "axios";
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
 import axios from "axios";
->>>>>>> resolve conflicts
-=======
-import axios from "axios";
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-import axios from "axios";
->>>>>>> resolve final conflicts
 // composition imports
 import { ref, inject } from "vue";
 import { useStore } from "vuex";
@@ -280,21 +218,6 @@ 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
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-import AgentIntegrations from "@/components/modals/agents/AgentIntegrations";
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
-import AgentIntegrations from "@/components/modals/agents/AgentIntegrations";
->>>>>>> resolve conflicts
-=======
-import AgentIntegrations from "@/components/modals/agents/AgentIntegrations";
->>>>>>> resolve final conflicts
 
 export default {
   name: "AgentActionMenu",
@@ -523,48 +446,6 @@ export default {
         }
       });
     }
-    function getAgentIntegrations(agent) {
-      axios
-          .get("agents/" + props.agent.agent_id + "/")
-          .then(r => {
-            let agentData = r.data
-            axios
-              .get("/integrations/")
-              .then(r => {
-                let integrations = []
-
-                if (r.data.length > 0){
-                  for(let integrationObj of r.data){
-                      if(integrationObj.enabled){
-                        integrations.push(integrationObj)
-                      }
-                    }
-                      $q.dialog({
-                      component: AgentIntegrations,
-                      componentProps: {
-                        agent: agentData,
-                        integrations: integrations,
-                      }
-                })
-                }else{
-                  notifyWarning("No integrations configured. Go to Settings > Integrations Manager");
-                  return;
-                }
-              })
-              .catch(() => {});
-                })
-          .catch((e) => {
-              console.log(e)
-          });
-    }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
->>>>>>> resolve conflicts
-=======
     function getAgentIntegrations(agent) {
       axios
         .get("agents/" + agent.agent_id + "/")
@@ -576,31 +457,11 @@ export default {
             console.log(e)
         });
     }
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> resolve final conflicts
 
     return {
       // reactive data
       urlActions,
       favoriteScripts,
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
-
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
->>>>>>> resolve conflicts
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> resolve final conflicts
       // methods
       showEditAgent,
       showPendingActionsModal,
@@ -608,25 +469,7 @@ export default {
       runRemoteBackground,
       getURLActions,
       runURLAction,
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-      getAgentIntegrations,
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
->>>>>>> massive cleanup of files and restructure of integrations design
-=======
-      getAgentIntegrations,
->>>>>>> resolve conflicts
-=======
-      getAgentIntegrations,
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
       getAgentIntegrations,
->>>>>>> resolve final conflicts
       showSendCommand,
       showRunScript,
       getFavoriteScripts,
diff --git a/web/src/components/integrations/IntegrationsManager.vue b/web/src/components/integrations/IntegrationsManager.vue
index 1e1d2dd077..9a9418e54a 100644
--- a/web/src/components/integrations/IntegrationsManager.vue
+++ b/web/src/components/integrations/IntegrationsManager.vue
@@ -118,14 +118,7 @@
             componentProps: {
               id: id,
               name: name,
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
               integration: integration
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-              integration: integration
->>>>>>> allow Meraki integration dashboard at client level as well as agent
             }
           }) 
             .onOk(() => {
@@ -138,14 +131,7 @@
             componentProps: {
               id: id,
               name: name,
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-              integration: integration
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
               integration: integration
->>>>>>> allow Meraki integration dashboard at client level as well as agent
             },
           })
             .onOk(() => {
diff --git a/web/src/components/integrations/bitdefender/Bitdefender.vue b/web/src/components/integrations/bitdefender/Bitdefender.vue
index 6804186247..2458499f04 100644
--- a/web/src/components/integrations/bitdefender/Bitdefender.vue
+++ b/web/src/components/integrations/bitdefender/Bitdefender.vue
@@ -1,236 +1,12 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-      <q-card flat>
-        <q-tabs
-          v-model="tab"
-          dense
-          align="left"
-          class="text-grey"
-          active-color="primary"
-          indicator-color="primary"
-          no-caps
-          narrow-indicator
-          inline-label
-        >
-=======
     <q-card flat>
         <q-tabs v-model="tab" dense align="left" class="text-grey" active-color="primary" indicator-color="primary"
             no-caps narrow-indicator inline-label>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-    <q-card flat>
-        <q-tabs v-model="tab" dense align="left" class="text-grey" active-color="primary" indicator-color="primary"
-            no-caps narrow-indicator inline-label>
->>>>>>> implement q.loading and bitdefender component work
           <q-tab icon="computer" name="endpoint" label="Endpoint" />
           <q-tab icon="summarize" name="reports" label="Reports" />
           <q-tab icon="local_police" name="quarantine" label="Quarantine" />
         </q-tabs>
         <q-tab-panels v-model="tab" animated>
-<<<<<<< HEAD
-<<<<<<< HEAD
-          <q-tab-panel name="endpoint">
-            <div class="text-h6">Mails</div>
-            Lorem ipsum dolor sit amet consectetur adipisicing elit.
-          </q-tab-panel>
-
-          <q-tab-panel name="reports">
-            <div class="text-h6">Alarms</div>
-            Lorem ipsum dolor sit amet consectetur adipisicing elit.
-          </q-tab-panel>
-
-          <q-tab-panel name="quarantine">
-            <div class="text-h6">Movies</div>
-            Lorem ipsum dolor sit amet consectetur adipisicing elit.
-          </q-tab-panel>
-        </q-tab-panels>
-      </q-card>
-=======
-            <q-tab-panel name="endpoint">
-                <q-btn-dropdown label="Actions" flat>
-                    <q-list>
-                        <q-item clickable v-close-popup @click="checkout()">
-                            <q-item-section>
-                                <q-item-label>Quick Scan</q-item-label>
-                            </q-item-section>
-                        </q-item>
-
-                        <q-item clickable v-close-popup @click="checkin()">
-                            <q-item-section>
-                                <q-item-label>Full Scan</q-item-label>
-                            </q-item-section>
-                        </q-item>
-                    </q-list>
-                </q-btn-dropdown>
-                <div class="row">
-                    <div class="col-5">
-                        <q-list>
-                        <q-item-section>
-                            <q-item-label header>GENERAL </q-item-label>
-                        </q-item-section>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Name</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    {{endpoint.name}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>ID</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    {{endpoint.id}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Policy</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    {{endpoint.policy}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Last Seen</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    {{endpoint.lastSeen}}
-                                </q-item-section>
-                            </q-item>
-                            <q-separator inset/>
-                            <q-item-label header>AGENT</q-item-label>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Product Version</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    
-                                        {{endpoint.productVersion}}
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Engine Version</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-           
-                                        {{endpoint.engineVersion}}
-                                </q-item-section>
-                            </q-item>
-
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Last Update</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                        {{endpoint.lastUpdated}}
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Malware Detected</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    
-                                        {{endpoint.malwareDetected}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                            <q-item-section top>
-                                    <q-item-label>Infected</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    
-                                        {{endpoint.malwareInfected}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-separator inset/>
-                            <q-item-label header>MODULES</q-item-label>
-                            <q-item dense v-for="moduleObj of modules">
-                                <q-item-section top>
-                                    <q-item-label>{{moduleObj.label}}</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    
-                                        {{moduleObj.value}}
-                                </q-item-section>
-                            </q-item>
-                        </q-list>
-                    </div>
-                    <div class="col-7">
-                        <div class="row q-mt-sm">
-                            <div class="col-12">
-                                <q-card class="q-mx-sm q-mb-sm q-my-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-h6">Risk Score</span>
-                                            <q-linear-progress size="20px" :value="endpoint.riskScore" color="negative">
-                                            <div class="absolute-full flex flex-center">
-                                                <q-badge color="white" text-color="black" :label="endpoint.riskScore + ' - ' + endpoint.impact" />
-                                            </div>
-                                            </q-linear-progress>
-                                    </q-card-section>
-                                </q-card>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-                                <q-card class="q-mx-sm q-my-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">Misconfigurations</span>
-                                        <div class="text-h6">
-                                            {{endpoint.misconfigurations}}
-                                        </div>
-                                    </q-card-section>
-                                </q-card>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-                                  <q-card class="q-mx-sm q-my-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">App Vulnerabilities</span>
-                                        <div class="text-h6">
-                                            {{endpoint.appVulnerabilities}}
-                                        </div>
-                                    </q-card-section>
-                                </q-card>
-                            </div>
-                            <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-                                <q-card class="q-mx-sm q-my-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">Human Risks</span>
-                                        <div class="text-h6">
-                                            {{endpoint.humanRisks}}
-                                        </div>
-                                    </q-card-section>
-                                </q-card>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </q-tab-panel>
-
-            <q-tab-panel name="reports">
-                Lorem ipsum dolor sit amet consectetur adipisicing elit.
-            </q-tab-panel>
-
-            <q-tab-panel name="quarantine">
-                Lorem ipsum dolor sit amet consectetur adipisicing elit.
-            </q-tab-panel>
-        </q-tab-panels>
-    </q-card>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
             <q-tab-panel name="endpoint">
                 <q-btn-dropdown label="Actions" flat>
                     <q-list>
@@ -413,7 +189,6 @@
             </q-tab-panel>
         </q-tab-panels>
     </q-card>
->>>>>>> implement q.loading and bitdefender component work
 </template>
 
 <script>
@@ -421,15 +196,7 @@
     import { ref, computed, watch, onMounted } from "vue";
     import { useQuasar, useDialogPluginComponent, date } from "quasar";
     import { notifySuccess, notifyError, notifyWarning } from "@/utils/notify";
-<<<<<<< HEAD
-<<<<<<< HEAD
-    import ScanEndpoint from "@/components/integrations/bitdefender/ScanEndpointConfirm";
-=======
     import ScanEndpoint from "@/components/integrations/bitdefender/modals/ScanEndpointConfirm";
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-    import ScanEndpoint from "@/components/integrations/bitdefender/modals/ScanEndpointConfirm";
->>>>>>> implement q.loading and bitdefender component work
 
     const columns = [
         {
@@ -504,38 +271,6 @@
             const tab = ref("")
             const tacticalAgentMacs = ref([])
             const bitdefenderEndpoints = ref([])
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-            function getTacticalAgentMacs(){
-                axios
-                    .get("agents/" + props.agent.agent_id + "/")
-                    .then(r => {
-                        for (let adapters of r.data.wmi_detail.network_adapter) {
-                            for (let adapter of adapters) {
-                                let macStr = String(adapter.MACAddress)
-                                let macs = macStr.replaceAll(":", "").toLowerCase()
-                                tacticalAgentMacs.value.push(macs)
-                            }
-                        }
-                        getBitdefenderEndpoints()
-                    })
-                    .catch((e) => {
-                        console.log(e)
-                    });
-            }
-=======
-            const bitdefenderEndpointMacs = ref([])
-            const bitdefenderEndpoint = ref([])
-            const endpoint = ref([])
-            const modules = ref([])
->>>>>>> implement q.loading and bitdefender component work
-
-            async function getBitdefenderEndpoints(){
-                $q.loading.show()
-                const bitdefenderEndpointsArray = [];
-<<<<<<< HEAD
-=======
             const bitdefenderEndpointMacs = ref([])
             const bitdefenderEndpoint = ref([])
             const endpoint = ref([])
@@ -545,10 +280,6 @@
                 $q.loading.show()
                 const bitdefenderEndpointsArray = [];
                 const r = await axios.get(`/bitdefender/endpoints/`, { params: { pageNumber: 1 } });
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                const r = await axios.get(`/bitdefender/endpoints/`, { params: { pageNumber: 1 } });
->>>>>>> implement q.loading and bitdefender component work
                 
                 for (let i = 0; i < r.data.result.pagesCount; i++) {
                     let nextPage = i + 1
@@ -559,10 +290,6 @@
                 for (let i = 0; i < resolvedbitdefenderEndpoints.length; i++) {
                     bitdefenderEndpoints.value.push(...resolvedbitdefenderEndpoints[i].data.result.items)
                 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-                console.log(bitdefenderEndpoints.value)
-=======
 
                 for (let i = 0; i < props.agent.wmi_detail.network_adapter.length; i++){
                     for (let obj of props.agent.wmi_detail.network_adapter[i]){
@@ -583,7 +310,6 @@
                     }
                 notifyError("Could not find a " + props.agent.hostname + " in Bitdefender GravityZone")
 
->>>>>>> implement q.loading and bitdefender component work
             }
 
             function getBitdefenderEndpoint(){
@@ -622,72 +348,7 @@
 
 
             onMounted(() => {
-<<<<<<< HEAD
-                getTacticalAgentMacs()
-=======
-
-                for (let i = 0; i < props.agent.wmi_detail.network_adapter.length; i++){
-                    for (let obj of props.agent.wmi_detail.network_adapter[i]){
-                        const macStr = String(obj.MACAddress)
-                        const macs = macStr.replaceAll(":", "").toLowerCase()
-                        tacticalAgentMacs.value.push(macs)
-                    }
-                }
-                    for (let i = 0; i < bitdefenderEndpoints.value.length; i++){
-                        bitdefenderEndpointMacs.value.push(bitdefenderEndpoints.value[i].details.macs[0])
-                        const macMatch = tacticalAgentMacs.value.filter(element => bitdefenderEndpointMacs.value.includes(element))
-                        if(macMatch.length > 0){
-                            bitdefenderEndpoint.value = bitdefenderEndpoints.value[i]
-                            tab.value = 'endpoint'
-                            getBitdefenderEndpoint()
-                            return;                    
-                        }
-                    }
-                notifyError("Could not find a " + props.agent.hostname + " in Bitdefender GravityZone")
-
-            }
-
-            function getBitdefenderEndpoint(){
-                axios
-                .get(`/bitdefender/endpoint/` + bitdefenderEndpoint.value.id + `/`)
-                .then(r => {
-                    endpoint.value = {
-                        id: r.data.result.id,
-                        name: r.data.result.name,
-                        policy: r.data.result.policy.name,
-                        lastSeen: date.formatDate(r.data.result.lastSeen, 'ddd, MMM MM, YYYY @ hh:mm A'),
-                        productVersion: r.data.result.agent.productVersion,
-                        engineVersion: r.data.result.agent.engineVersion,
-                        lastUpdated: date.formatDate(r.data.result.agent.lastUpdate, 'ddd, MMM MM, YYYY @ hh:mm A'),
-                        malwareDetected: r.data.result.malwareStatus.detection,
-                        malwareInfected: r.data.result.malwareStatus.infected,
-                        riskScore: r.data.result.riskScore ? r.data.result.riskScore.value : "N/A",
-                        impact: r.data.result.riskScore ? r.data.result.riskScore.impact : "N/A",
-                        misconfigurations: r.data.result.riskScore ? r.data.result.riskScore.misconfigurations : "N/A",
-                        appVulnerabilities: r.data.result.riskScore ? r.data.result.riskScore.appVulnerabilities : "N/A",
-                        humanRisks: r.data.result.riskScore ? r.data.result.riskScore.humanRisks : "N/A",
-                    }
-                    for(const [key, value] of Object.entries(r.data.result.modules)) {
-                        let obj = {
-                            label: key,
-                            value: value
-                        }
-                        modules.value.push(obj)
-                        $q.loading.hide()
-                    }
-                })
-                .catch(e => {
-                    console.log(e)
-                });
-            }
-
-
-            onMounted(() => {
-                getBitdefenderEndpoints()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                 getBitdefenderEndpoints()
->>>>>>> implement q.loading and bitdefender component work
             });
 
             return {
@@ -700,19 +361,9 @@
                 },
                 // rows,
                 // columns,
-<<<<<<< HEAD
-<<<<<<< HEAD
-                filter: ref(""),
-=======
-                endpoint,
-                filter: ref(""),
-                modules,
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                 endpoint,
                 filter: ref(""),
                 modules,
->>>>>>> implement q.loading and bitdefender component work
                 // quasar dialog
                 dialogRef,
                 onDialogHide,
diff --git a/web/src/components/integrations/meraki/AgentMeraki.vue b/web/src/components/integrations/meraki/AgentMeraki.vue
index 01a2350d92..806255b8cd 100644
--- a/web/src/components/integrations/meraki/AgentMeraki.vue
+++ b/web/src/components/integrations/meraki/AgentMeraki.vue
@@ -127,7 +127,7 @@
           // console.log(tacticalAgentMacs.value[i])
           if (tacticalAgentMacs.value[i]) {
 
-            merakiClientsArray.push(await axios.get(`/meraki/` + organizations.value[0].id + `/client/` + tacticalAgentMacs.value[i] + `/`).catch(e => { }))
+            merakiClientsArray.push(await axios.get(`/meraki/` + organizations.value[0].id + `/client/` + tacticalAgentMacs.value[i] + `/`).catch(e => { notifyError("API errored out")}))
 
           }
 
@@ -137,8 +137,6 @@
           clients.value.push(...resolvedMerakiClients[i].data.result.items)
         }
 
-
-
         for (let i = 0; i < resolvedMerakiClients.length; i++) {
           if (resolvedMerakiClients[i].data) {
             console.log(resolvedMerakiClients[i].data.records)
@@ -152,14 +150,10 @@
               user: resolvedMerakiClients[i].data.records[0].user
             }
             rows.value.push(clientObj)
-            console.log(clientObj)
-
-
-
           }
         }
 
-$q.loading.hide()
+      $q.loading.hide()
       }
       
       onMounted(() => {
diff --git a/web/src/components/integrations/meraki/events/NetworkEventsTable.vue b/web/src/components/integrations/meraki/events/NetworkEventsTable.vue
index c9780b4200..9fa88483eb 100644
--- a/web/src/components/integrations/meraki/events/NetworkEventsTable.vue
+++ b/web/src/components/integrations/meraki/events/NetworkEventsTable.vue
@@ -1,21 +1,5 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-  <div class="q-pb-md q-pl-md q-gutter-sm">
-    <q-breadcrumbs>
-      <q-breadcrumbs-el icon="home" class="text-black" />
-      <q-breadcrumbs-el class="text-black" :label="organizationName" />
-      <q-breadcrumbs-el class="text-black" :label="networkName" />
-      <q-breadcrumbs-el class="text-black" label="Events" />
-    </q-breadcrumbs>
-  </div>
-<<<<<<< HEAD
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
+
   <q-table :rows="rows" :columns="columns" row-key="occurredAt" v-model:pagination="pagination" :loading="loading"
     :filter="filter" wrap-cells>
     <template v-slot:loading v-model="loading">
diff --git a/web/src/components/integrations/meraki/organization/Overview.vue b/web/src/components/integrations/meraki/organization/Overview.vue
index 8ec4b76b00..230b2af7ec 100644
--- a/web/src/components/integrations/meraki/organization/Overview.vue
+++ b/web/src/components/integrations/meraki/organization/Overview.vue
@@ -1,21 +1,4 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-
-  <div class="q-pb-md q-pl-md q-gutter-sm">
-    <q-breadcrumbs>
-      <q-breadcrumbs-el icon="home" class="text-black" />
-      <q-breadcrumbs-el class="text-black" :label="organizationName" />
-      <q-breadcrumbs-el class="text-black" label="Overview" />
-    </q-breadcrumbs>
-  </div>
-<<<<<<< HEAD
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
   <q-scroll-area style="height: 230px">
     <q-inner-loading :showing="uplinksLoading" color="primary" />
     <div class="q-pb-md row justify-center q-gutter-md">
diff --git a/web/src/components/integrations/meraki/organization/TopClientsTable.vue b/web/src/components/integrations/meraki/organization/TopClientsTable.vue
index 5ec3cd37bc..3c6a01871b 100644
--- a/web/src/components/integrations/meraki/organization/TopClientsTable.vue
+++ b/web/src/components/integrations/meraki/organization/TopClientsTable.vue
@@ -1,20 +1,4 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-  <div class="q-pb-md q-pl-md q-gutter-sm">
-    <q-breadcrumbs>
-      <q-breadcrumbs-el icon="home" class="text-black" />
-      <q-breadcrumbs-el class="text-black" :label="organizationName" />
-      <q-breadcrumbs-el class="text-black" label="Top 10 clients" />
-    </q-breadcrumbs>
-  </div>
-<<<<<<< HEAD
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
   <q-table class="q-pt-md q-mb-xl" :rows="rows" :columns="columns" row-key="occurredAt" v-model:pagination="pagination"
     :loading="isLoading" :filter="filter" wrap-cells>
     <template v-slot:loading v-model="isLoading">
diff --git a/web/src/components/integrations/meraki/traffic/NetworkApplicationTrafficTable.vue b/web/src/components/integrations/meraki/traffic/NetworkApplicationTrafficTable.vue
index 6feb7c3736..d70cf4fd24 100644
--- a/web/src/components/integrations/meraki/traffic/NetworkApplicationTrafficTable.vue
+++ b/web/src/components/integrations/meraki/traffic/NetworkApplicationTrafficTable.vue
@@ -1,22 +1,5 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-  <div class="q-pb-md q-pl-md q-gutter-sm">
-    <q-breadcrumbs>
-      <q-breadcrumbs-el icon="home" class="text-black" />
-      <q-breadcrumbs-el class="text-black" :label="organizationName" />
-      <q-breadcrumbs-el class="text-black" :label="networkName" />
-      <q-breadcrumbs-el class="text-black" label="Traffic" />
-      <q-breadcrumbs-el label="Applications" />
-    </q-breadcrumbs>
-  </div>
-<<<<<<< HEAD
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
+
   <q-table :rows="rows" :columns="columns" row-key="name" v-model:pagination="pagination"
     :visible-columns="applicationTrafficColumnsVisible" :loading="isLoading" :filter="filter">
     <template v-slot:loading v-model="isLoading">
diff --git a/web/src/components/integrations/meraki/traffic/NetworkClientsTrafficTable.vue b/web/src/components/integrations/meraki/traffic/NetworkClientsTrafficTable.vue
index 6701f4c6a9..4374ce1aee 100644
--- a/web/src/components/integrations/meraki/traffic/NetworkClientsTrafficTable.vue
+++ b/web/src/components/integrations/meraki/traffic/NetworkClientsTrafficTable.vue
@@ -1,22 +1,4 @@
 <template>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
-  <div class="q-pb-md q-pl-md q-gutter-sm">
-    <q-breadcrumbs>
-      <q-breadcrumbs-el icon="home" class="text-black" />
-      <q-breadcrumbs-el class="text-black" :label="organizationName" />
-      <q-breadcrumbs-el class="text-black" :label="networkName" />
-      <q-breadcrumbs-el class="text-black" label="Traffic" />
-      <q-breadcrumbs-el label="Clients" />
-    </q-breadcrumbs>
-  </div>
-<<<<<<< HEAD
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
   <div v-if="isLoaded">
     <MerakiClientModal v-model="clientModalVisible" @close="clientModalClose"
       :maximized="$q.platform.is.mobile ? clientModalVisible : false" :networkID="networkID" :clientID="clientID" />
diff --git a/web/src/components/integrations/snipeit/SnipeIT.vue b/web/src/components/integrations/snipeit/SnipeIT.vue
index 782086fb56..617103478a 100644
--- a/web/src/components/integrations/snipeit/SnipeIT.vue
+++ b/web/src/components/integrations/snipeit/SnipeIT.vue
@@ -10,51 +10,19 @@
             <q-tab-panel name="asset">
                 <q-btn-dropdown label="Actions" flat>
                     <q-list>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        <q-item clickable v-close-popup @click="scanEndpointConfirm('quick')">
-=======
                         <q-item clickable v-close-popup @click="checkout()" v-if="asset.user_can_checkout">
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                        <q-item clickable v-close-popup @click="checkout()">
->>>>>>> checkin/checkout and delete asset
-=======
-                        <q-item clickable v-close-popup @click="checkout()" v-if="asset.user_can_checkout">
->>>>>>> display depreciation values
                             <q-item-section>
                                 <q-item-label>Checkout</q-item-label>
                             </q-item-section>
                         </q-item>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        <q-item clickable v-close-popup @click="scanEndpointConfirm('full')">
-=======
-                        <q-item clickable v-close-popup @click="checkin()" v-else>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                        <q-item clickable v-close-popup @click="checkin()">
->>>>>>> checkin/checkout and delete asset
-=======
                         <q-item clickable v-close-popup @click="checkin()" v-else>
->>>>>>> display depreciation values
                             <q-item-section>
                                 <q-item-label>Checkin</q-item-label>
                             </q-item-section>
                         </q-item>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        <q-item clickable v-close-popup @click="scanEndpointConfirm('full')">
-=======
-                        <q-item clickable v-close-popup @click="deleteAsset()">
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                         <q-item clickable v-close-popup @click="deleteAsset()">
->>>>>>> checkin/checkout and delete asset
                             <q-item-section>
                                 <q-item-label>Delete Asset</q-item-label>
                             </q-item-section>
@@ -64,46 +32,21 @@
                 <div class="row">
                     <div class="col-5">
                         <q-list>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                            <q-item-label header>General</q-item-label>
-=======
                         <q-item-section>
                             <q-item-label header>GENERAL </q-item-label>
                         </q-item-section>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                        <q-item-section>
-                            <q-item-label header>GENERAL </q-item-label>
-                        </q-item-section>
->>>>>>> more reorganization of unused files/folders and list formatting
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>Name</q-item-label>
                                 </q-item-section>
                                 <q-item-section side top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label caption>{{asset.name}}
-                                    </q-item-label>
-=======
-                                    {{asset.name}}
-                                    
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                                     {{asset.name}}
                                     
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label>Model</q-item-label>
-=======
                                     <q-item-label>Model Name</q-item-label>
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
 
                                 <q-item-section side top>
@@ -126,107 +69,21 @@
                                     <q-item-label>Serial</q-item-label>
                                 </q-item-section>
                                 <q-item-section side top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label caption>{{asset.status_label["name"]}}
-                                    </q-item-label>
-=======
-                                    <q-item-label>Model Name</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    {{asset.model.name}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                           <q-item dense>
-                                <q-item-section top>
-                                    <q-item-label>Model Number</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    {{asset.model_number}}
-                                    
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                    <q-item-label caption>{{asset.serial}}</q-item-label>
->>>>>>> checkin/checkout and delete asset
-=======
                                     {{asset.serial}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label>Company</q-item-label>
-=======
                                     <q-item-label>Status</q-item-label>
->>>>>>> checkin/checkout and delete asset
                                 </q-item-section>
 
                                 <q-item-section side top>
-<<<<<<< HEAD
-                                    <q-item-label caption>{{asset.status_label.name}}
-                                    </q-item-label>
-=======
-                                    <q-item-label>Serial</q-item-label>
-                                </q-item-section>
-                                <q-item-section side top>
-                                    {{asset.serial}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                                     {{asset.status_label.name}}
                                     
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label>Location</q-item-label>
-=======
-                                    <q-item-label>Company</q-item-label>
->>>>>>> checkin/checkout and delete asset
-                                </q-item-section>
-                                <q-item-section side top>
-<<<<<<< HEAD
-                                    <q-item-label caption>{{asset.company.name}}
-                                    </q-item-label>
-=======
-                                    <q-item-label>Status</q-item-label>
-                                </q-item-section>
-
-                                <q-item-section side top>
-                                    {{asset.status_label.name}}
-                                    
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                    {{asset.company.name}}
-                                    
->>>>>>> more reorganization of unused files/folders and list formatting
-                                </q-item-section>
-                            </q-item>
-                            <q-item dense>
-                                <q-item-section top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label>Serial</q-item-label>
-=======
-                                    <q-item-label>Location</q-item-label>
->>>>>>> checkin/checkout and delete asset
-                                </q-item-section>
-                                <q-item-section side top v-if="asset.location">
-                                    {{asset.location.name}}
-                                    
-                                </q-item-section>
-                            </q-item>
-<<<<<<< HEAD
-
-                            <q-item-label header>Purchasing</q-item-label>
-=======
                                     <q-item-label>Company</q-item-label>
                                 </q-item-section>
                                 <q-item-section side top>
@@ -244,63 +101,24 @@
                                 </q-item-section>
                             </q-item>
                             <q-separator inset/>
-<<<<<<< HEAD
-                            <q-item-label header>PURCHASING</q-item-label>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-<q-separator inset/>
-=======
->>>>>>> implement q.loading and bitdefender component work
                             <q-item-label header>PURCHASING</q-item-label>
->>>>>>> more reorganization of unused files/folders and list formatting
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>Manufacturer</q-item-label>
                                 </q-item-section>
 
                                 <q-item-section side top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label caption>
-<<<<<<< HEAD
-                                        manufacturer</q-item-label>
-=======
-                                    
-                                        {{asset.manufacturer.name}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                        {{asset.manufacturer.name}}</q-item-label>
->>>>>>> checkin/checkout and delete asset
-=======
                                     
                                         {{asset.manufacturer.name}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>Purchase Date</q-item-label>
                                 </q-item-section>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                <q-item-section side top>
-<<<<<<< HEAD
-                                    <q-item-label caption>
-                                        {{asset.purchase_date}}</q-item-label>
-=======
-                                <q-item-section side top v-if="asset.purchase_date">
-           
-                                        {{asset.purchase_date.formatted}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                    <q-item-label caption v-if="asset.purchase_date">
-                                        {{asset.purchase_date.formatted}}</q-item-label>
->>>>>>> display depreciation values
-=======
                                 <q-item-section side top v-if="asset.purchase_date">
            
                                         {{asset.purchase_date.formatted}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
@@ -308,131 +126,44 @@
                                     <q-item-label>Purchase Cost</q-item-label>
                                 </q-item-section>
                                 <q-item-section side top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label caption>
-=======
                                     
->>>>>>> more reorganization of unused files/folders and list formatting
                                         ${{asset.purchase_cost}}
                                     
                                 </q-item-section>
                             </q-item>
-<<<<<<< HEAD
-                            <q-item-label header>Warranty</q-item-label>
-=======
-                                    
-                                        ${{asset.purchase_cost}}
-                                    
-                                </q-item-section>
-                            </q-item>
-                            <q-separator inset/>
-                            <q-item-label header>WARRANTY</q-item-label>
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                             <q-separator inset/>
                             <q-item-label header>WARRANTY</q-item-label>
->>>>>>> more reorganization of unused files/folders and list formatting
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>Months</q-item-label>
                                 </q-item-section>
                                 <q-item-section side top>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                    <q-item-label caption>
-<<<<<<< HEAD
-                                        months</q-item-label>
-=======
-                                    
-                                        {{asset.warranty_months}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                        {{asset.warranty_months}}</q-item-label>
->>>>>>> checkin/checkout and delete asset
-=======
-                                    <q-item-label caption v-if="asset.warranty_months">
-                                        {{asset.warranty_months.formatted}}</q-item-label>
->>>>>>> display depreciation values
-=======
                                     
                                         {{asset.warranty_months}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>Expires</q-item-label>
                                 </q-item-section>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                <q-item-section side top>
-<<<<<<< HEAD
-                                    <q-item-label caption>
-<<<<<<< HEAD
-                                        expires</q-item-label>
-=======
-                                <q-item-section side top v-if="asset.warranty_expires">
-                                    
-                                        {{asset.warranty_expires.formatted}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                        {{asset.warranty_expires}}</q-item-label>
->>>>>>> checkin/checkout and delete asset
-=======
-                                    <q-item-label caption v-if="asset.warranty_expires">
-                                        {{asset.warranty_expires.formatted}}</q-item-label>
->>>>>>> display depreciation values
-=======
                                 <q-item-section side top v-if="asset.warranty_expires">
                                     
                                         {{asset.warranty_expires.formatted}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                             <q-item dense>
                                 <q-item-section top>
                                     <q-item-label>End of Life</q-item-label>
                                 </q-item-section>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                <q-item-section side top>
-<<<<<<< HEAD
-                                    <q-item-label caption>
-<<<<<<< HEAD
-                                        eol</q-item-label>
-=======
-                                <q-item-section side top v-if="asset.eol">
-                                   
-                                        {{asset.eol.formatted}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                        {{asset.eol}}</q-item-label>
->>>>>>> checkin/checkout and delete asset
-=======
-                                    <q-item-label caption v-if="asset.eol">
-                                        {{asset.eol.formatted}}</q-item-label>
->>>>>>> display depreciation values
-=======
                                 <q-item-section side top v-if="asset.eol">
                                    
                                         {{asset.eol.formatted}}
->>>>>>> more reorganization of unused files/folders and list formatting
                                 </q-item-section>
                             </q-item>
                         </q-list>
                     </div>
                     <div class="col-7">
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        <div class="row">
-=======
                         <div class="row q-mt-sm">
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                        <div class="row q-mt-sm">
->>>>>>> more reorganization of unused files/folders and list formatting
                             <div class="col-12">
                                 <q-card class="q-mx-sm q-mb-sm">
                                     <q-card-section class="text-center">
@@ -446,71 +177,31 @@
                         </div>
                         <div class="row">
                             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-<<<<<<< HEAD
-                                <q-card class="q-mx-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">Current Value</span>
-                                        <div class="text-h6">
-<<<<<<< HEAD
-                                            {{asset.name}}
-=======
                                 <q-card class="q-mx-sm q-my-sm">
                                     <q-card-section class="text-center">
                                         <span class="text-weight-light">Current Value</span>
                                         <div class="text-h6">
                                             ${{currentValue}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                            ${{currentValue}}
->>>>>>> display depreciation values
                                         </div>
                                     </q-card-section>
                                 </q-card>
                             </div>
                             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-<<<<<<< HEAD
-<<<<<<< HEAD
-                                <q-card class="q-mx-sm">
-=======
-                                  <q-card class="q-mx-sm">
->>>>>>> display depreciation values
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">Monthly Depcreciation</span>
-                                        <div class="text-h6">
-<<<<<<< HEAD
-                                            {{asset.name}}
-=======
                                   <q-card class="q-mx-sm q-my-sm">
                                     <q-card-section class="text-center">
                                         <span class="text-weight-light">Monthly Depcreciation</span>
                                         <div class="text-h6">
                                             ${{monthlyDepreciation}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                            ${{monthlyDepreciation}}
->>>>>>> display depreciation values
                                         </div>
                                     </q-card-section>
                                 </q-card>
                             </div>
                             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
-<<<<<<< HEAD
-                                <q-card class="q-mx-sm">
-                                    <q-card-section class="text-center">
-                                        <span class="text-weight-light">Difference</span>
-                                        <div class="text-h6">
-<<<<<<< HEAD
-                                            {{asset.name}}
-=======
                                 <q-card class="q-mx-sm q-my-sm">
                                     <q-card-section class="text-center">
                                         <span class="text-weight-light">Difference</span>
                                         <div class="text-h6">
                                             ${{difference}}
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-                                            ${{difference}}
->>>>>>> display depreciation values
                                         </div>
                                     </q-card-section>
                                 </q-card>
@@ -538,16 +229,8 @@
     import { notifySuccess, notifyError, notifyWarning } from "@/utils/notify";
     import { useRouter } from 'vue-router';
     import AddAsset from "@/components/integrations/snipeit/modals/AddAsset";
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    import Checkout from "@/components/integrations/snipeit/modals/Checkout";
-    import Checkin from "@/components/integrations/snipeit/modals/Checkin";
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
     import Checkout from "@/components/integrations/snipeit/modals/Checkout";
     import Checkin from "@/components/integrations/snipeit/modals/Checkin";
->>>>>>> checkin/checkout and delete asset
 
     export default {
         name: "SnipeIT",
@@ -555,48 +238,18 @@
         props: ['agent'],
 
         setup(props) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-            const { dialogRef, onDialogHide } = useDialogPluginComponent();
-=======
-            const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
             const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
->>>>>>> checkin/checkout and delete asset
             const $q = useQuasar();
 
             const tab = ref("")
             const asset = ref([])
             const foundAsset = ref(null)
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-            function getHardware() {
-<<<<<<< HEAD
-                asset.value = []
-=======
             const monthlyDepreciation = ref("")
             const currentValue = ref("")
             const difference = ref("")
-<<<<<<< HEAD
-
-=======
-            const monthlyDepreciation = ref("")
-            const currentValue = ref("")
-            const difference = ref("")
->>>>>>> display depreciation values
-            function getHardware() {
-                $q.loading.show()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-
->>>>>>> checkin/checkout and delete asset
-=======
 
             function getHardware() {
                 $q.loading.show()
->>>>>>> implement q.loading and bitdefender component work
                 axios
                     .get(`/snipeit/hardware/`, { params: { status: 'All' } })
                     .then(r => {
@@ -604,14 +257,7 @@
                         const tacticalAgentHostname = []
                         const snipeITAssetsModelNameNumber = []
                         const snipeITAssetsModelNumber = []
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                        const snipeITAssetTags = []
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                         const snipeITAssetTags = []
->>>>>>> checkin/checkout and delete asset
                         const snipeITAssetHostnames = []
                         tacticalAgentModels.push(props.agent.wmi_detail.comp_sys[0][0].Model)
                         tacticalAgentModels.push(props.agent.wmi_detail.comp_sys_prod[0][0].Name)
@@ -619,47 +265,15 @@
 
                         let i = 0;
                         do {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                            for (let hardwareObj of r.data.rows) {
-                                snipeITAssetsModelNameNumber.push(hardwareObj.model.name + " " + hardwareObj.model_number)
-                                snipeITAssetsModelNumber.push(hardwareObj.model_number)
-                                snipeITAssetHostnames.push(hardwareObj.name)
-=======
-=======
-                            // for (let hardwareObj of r.data.rows) {
->>>>>>> checkin/checkout and delete asset
-=======
->>>>>>> implement q.loading and bitdefender component work
                                 snipeITAssetsModelNameNumber.push(r.data.rows[i].model.name + " " + r.data.rows[i].model_number)
                                 snipeITAssetsModelNumber.push(r.data.rows[i].model_number)
                                 snipeITAssetTags.push(r.data.rows[i].asset_tag)
                                 snipeITAssetHostnames.push(r.data.rows[i].name)
-<<<<<<< HEAD
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> checkin/checkout and delete asset
 
                                 //Match on Model Number
                                 const modelNumber = tacticalAgentModels.filter(element => snipeITAssetsModelNumber.includes(element))
                                 //Match on Model Name and Number
                                 const modelNameNumber = tacticalAgentModels.filter(element => snipeITAssetsModelNameNumber.includes(element))
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                                //Match on Asset Tag
-                                const assetTag = tacticalAgentModels.filter(element => snipeITAssetTags.includes(element))
->>>>>>> checkin/checkout and delete asset
-                                //Match on hostname
-                                const hostnameMatch = tacticalAgentHostname.filter(element => snipeITAssetHostnames.includes(element))
-
-                                if (modelNumber.length > 0 && hostnameMatch.length > 0 || modelNameNumber.length > 0 && hostnameMatch.length > 0 || modelNumber.length > 0 && modelNameNumber.length > 0 && hostnameMatch.length > 0 || assetTag.length > 0 && hostnameMatch.length > 0) {
-                                    asset.value = []
-                                    asset.value = r.data.rows[i]
-                                    tab.value = 'asset'
-                                    foundAsset.value = true
-=======
                                 //Match on Asset Tag
                                 const assetTag = tacticalAgentModels.filter(element => snipeITAssetTags.includes(element))
                                 //Match on hostname
@@ -685,50 +299,20 @@
                                     tab.value = 'asset'
                                     foundAsset.value = true
                                     $q.loading.hide()
-<<<<<<< HEAD
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> implement q.loading and bitdefender component work
                                     return;
                                 } else {
                                     foundAsset.value = false
                                 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                            }
-=======
-                            // }
-
->>>>>>> checkin/checkout and delete asset
-                            i++;
-                        } while (i < r.data.rows.length);
-
-=======
-                            i++;
-                        } while (i < r.data.rows.length);
-                        $q.loading.hide()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                             i++;
                         } while (i < r.data.rows.length);
                         $q.loading.hide()
->>>>>>> implement q.loading and bitdefender component work
                         notifyError("Could not find a " + props.agent.hostname + " asset by the same name and model number in Snipe-IT")
                         addAsset()
 
                     })
                     .catch(e => {
                         console.log(e)
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    });
-=======
-                });
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                 });
->>>>>>> implement q.loading and bitdefender component work
             }
 
             function addAsset() {
@@ -741,11 +325,6 @@
                     getHardware()
                 })
             }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> checkin/checkout and delete asset
 
             function checkout(){
                 $q.dialog({
@@ -786,10 +365,6 @@
                 });
             }
 
-<<<<<<< HEAD
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> checkin/checkout and delete asset
             onMounted(() => {
                 getHardware()
             });
@@ -797,27 +372,12 @@
             return {
                 tab,
                 asset,
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                checkout,
-                checkin,
-                deleteAsset,
-                monthlyDepreciation,
-                currentValue,
-                difference,
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
                 checkout,
                 checkin,
                 deleteAsset,
-<<<<<<< HEAD
->>>>>>> checkin/checkout and delete asset
-=======
                 monthlyDepreciation,
                 currentValue,
                 difference,
->>>>>>> display depreciation values
                 // quasar dialog
                 dialogRef,
                 onDialogHide,
diff --git a/web/src/components/integrations/snipeit/modals/AddAsset.vue b/web/src/components/integrations/snipeit/modals/AddAsset.vue
index 4c503b1b18..6d6d64d0b8 100644
--- a/web/src/components/integrations/snipeit/modals/AddAsset.vue
+++ b/web/src/components/integrations/snipeit/modals/AddAsset.vue
@@ -34,39 +34,6 @@
               :rules="[(val) => !!val || '*Required']" />
         </q-step>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <q-step :name="3" title="Confirm" icon="create_new_folder" :done="step > 3">
-          <q-list dense>
-            <q-item>
-              <q-item-section>
-                clearTreeSelected
-              </q-item-section>
-            </q-item>
-            <q-item>
-              <q-item-section>
-                clearTreeSelected
-              </q-item-section>
-            </q-item>
-            <q-item>
-              <q-item-section>
-                clearTreeSelected
-              </q-item-section>
-            </q-item>
-            <q-item>
-              <q-item-section>
-                clearTreeSelected
-              </q-item-section>
-            </q-item>
-            <q-item>
-              <q-item-section>
-                clearTreeSelected
-              </q-item-section>
-            </q-item>
-          </q-list>
-=======
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
         <q-step :name="3" title="Review & Add" icon="create_new_folder" :done="step > 3">
                         <q-list>
                             <q-item dense>
@@ -159,24 +126,12 @@
                                 </q-item-section>
                             </q-item>
                         </q-list>
-<<<<<<< HEAD
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> allow Meraki integration dashboard at client level as well as agent
         </q-step>
 
         <template v-slot:navigation>
           <q-stepper-navigation>
             <q-btn v-if="step != 3" @click="$refs.stepper.next()" color="primary" label="Continue" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-            <q-btn v-else @click="addAsset()" color="primary" label="Finish" />
-=======
             <q-btn v-else @click="addAsset()" color="primary" label="Add" />
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-            <q-btn v-else @click="addAsset()" color="primary" label="Add" />
->>>>>>> allow Meraki integration dashboard at client level as well as agent
             <q-btn v-if="step > 1" flat color="primary" @click="$refs.stepper.previous()" label="Back"
               class="q-ml-sm" />
           </q-stepper-navigation>
@@ -202,14 +157,6 @@
     setup(props) {
       const { dialogRef, onDialogOK, onDialogHide } = useDialogPluginComponent();
       const $q = useQuasar();
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-
->>>>>>> implement q.loading and bitdefender component work
       const assetName = ref("")
       const companyOptions = ref([])
       const assetCompany = ref("")
@@ -238,14 +185,7 @@
       }
 
       function getCompanies() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         $q.loading.show()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-        $q.loading.show()
->>>>>>> implement q.loading and bitdefender component work
         axios
           .get(`/snipeit/companies/`)
           .then(r => {
@@ -293,14 +233,8 @@
               }
               assetStatusOptions.value.push(statusObj)
             }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-            $q.loading.hide()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
             $q.loading.hide()
->>>>>>> implement q.loading and bitdefender component work
           })
           .catch(e => {
             console.log(e.response.data)
@@ -308,14 +242,8 @@
       }
 
       function getModels() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        $q.loading.show()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
         $q.loading.show()
->>>>>>> implement q.loading and bitdefender component work
         axios
           .get(`/snipeit/models/`)
           .then(r => {
@@ -345,14 +273,7 @@
               }
               assetCategoryOptions.value.push(assetCategoryObj)
               }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-              $q.loading.hide()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
               $q.loading.hide()
->>>>>>> implement q.loading and bitdefender component work
           })
           .catch(e => {
               console.log(e.response.data)
@@ -386,13 +307,7 @@
             category: assetCategory.value
           }
          }).onOk(val => {
-<<<<<<< HEAD
-<<<<<<< HEAD
-           console.log(val)
-=======
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
->>>>>>> checkin/checkout and delete asset
+
               let modelObj = {
                 label: val['assetModel'],
                 value: val['assetModelID'],
@@ -403,14 +318,8 @@
       }
 
       function addAsset(){
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        $q.loading.show()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
         $q.loading.show()
->>>>>>> implement q.loading and bitdefender component work
         let data = {
           asset_tag: assetTag.value,
           status_id: assetStatus.value.value,
@@ -430,14 +339,8 @@
             notifySuccess(props.agent.hostname + " has been added as an asset to Snipe-IT")
             onDialogOK()
           }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          $q.loading.hide()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
           $q.loading.hide()
->>>>>>> implement q.loading and bitdefender component work
         })
         .catch(e => {
           console.log(e)
@@ -460,17 +363,8 @@
       })
 
       watch([assetManufacturer, assetCategory], ([manufacturer, category]) => {
-<<<<<<< HEAD
-<<<<<<< HEAD
-        console.log(manufacturer, category)
-        if(manufacturer && category){
-          console.log()
-=======
-        if(manufacturer && category){
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
         if(manufacturer && category){
->>>>>>> checkin/checkout and delete asset
           newModelButton.value = false
         }
       })
diff --git a/web/src/components/integrations/snipeit/modals/AddModel.vue b/web/src/components/integrations/snipeit/modals/AddModel.vue
index b2032fd927..b035089a0b 100644
--- a/web/src/components/integrations/snipeit/modals/AddModel.vue
+++ b/web/src/components/integrations/snipeit/modals/AddModel.vue
@@ -31,16 +31,7 @@
 
         setup(props) {
             const { dialogRef, onDialogOK, onDialogHide } = useDialogPluginComponent();
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
             const $q = useQuasar();
-
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
-            const $q = useQuasar();
-
->>>>>>> implement q.loading and bitdefender component work
             const assetModel = ref("")
             const assetModelOptions = ref([])
             const addNewModel = ref(true)
@@ -51,14 +42,8 @@
             }
 
             function onOKClick() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                $q.loading.show()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
                 $q.loading.show()
->>>>>>> implement q.loading and bitdefender component work
                 let data = {
                 model_name: assetModel.value,
                 model_number: assetModel.value,
@@ -73,14 +58,8 @@
                         notifyError(r.data.messages)
                     }else{
                         notifySuccess(r.data.messages)
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                        $q.loading.hide()
->>>>>>> 5a541b0209a0de11b20c5d153af1efa9333fd4ab
-=======
+
                         $q.loading.hide()
->>>>>>> implement q.loading and bitdefender component work
                         onDialogOK({"assetModel": assetModel.value, "assetModelID": r.data.payload.id, "addNewModel":addNewModel.value})
                     }
                 })
diff --git a/web/src/components/integrations/snipeit/modals/Checkout.vue b/web/src/components/integrations/snipeit/modals/Checkout.vue
index c01cd0aec3..4629250542 100644
--- a/web/src/components/integrations/snipeit/modals/Checkout.vue
+++ b/web/src/components/integrations/snipeit/modals/Checkout.vue
@@ -142,38 +142,15 @@
             function checkout(){
                 let data = {
                     id: props.asset.id,
-<<<<<<< HEAD
-<<<<<<< HEAD
                     assigned_user: user.value.value,
                     checkout_to_type: checkoutToType.value,
                     checkout_at: date.formatDate(checkoutDate.value, 'YYYY-MM-DD'),
                     expected_checkin: checkinDate.value ? date.formatDate(checkinDate.value, 'YYYY-MM-DD') : null,
                     note: notes.value 
-=======
-                    checkout_to_type: checkoutToType.value,
-                    checkout_at: date.formatDate(checkoutDate.value, 'YYYY-MM-DD'),
-                    expected_checkin: checkinDate.value ? date.formatDate(checkinDate.value, 'YYYY-MM-DD') : null,
-                    note: notes.value
->>>>>>> checkin/checkout and delete asset
-=======
-                    assigned_user: user.value.value,
-                    checkout_to_type: checkoutToType.value,
-                    checkout_at: date.formatDate(checkoutDate.value, 'YYYY-MM-DD'),
-                    expected_checkin: checkinDate.value ? date.formatDate(checkinDate.value, 'YYYY-MM-DD') : null,
-                    note: notes.value 
->>>>>>> allow Meraki integration dashboard at client level as well as agent
                 }
                 axios
                     .post(`/snipeit/hardware/` + props.asset.id + `/checkout/`, data)
                     .then(r => {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        console.log(r.data)
-=======
->>>>>>> checkin/checkout and delete asset
-=======
-                        console.log(r.data)
->>>>>>> allow Meraki integration dashboard at client level as well as agent
                         if(r.data.status === 'error'){
                             notifyError(r.data.messages)
                         }else{
diff --git a/web/src/components/tasks/AutomatedTaskForm.vue b/web/src/components/tasks/AutomatedTaskForm.vue
index fd539287e9..13c8e5a799 100644
--- a/web/src/components/tasks/AutomatedTaskForm.vue
+++ b/web/src/components/tasks/AutomatedTaskForm.vue
@@ -519,21 +519,11 @@
                 />
                 <div class="col-6"></div>
                 <q-checkbox
-<<<<<<< HEAD
-                  :disable="!state.expire_date"
-=======
->>>>>>> massive cleanup of files and restructure of integrations design
                   class="col-6 q-pa-sm"
                   dense
                   v-model="state.remove_if_not_scheduled"
                   label="Delete task if not scheduled for 30 days"
-<<<<<<< HEAD
-                >
-                  <q-tooltip>Must set an expire date</q-tooltip>
-                </q-checkbox>
-=======
                 />
->>>>>>> massive cleanup of files and restructure of integrations design
                 <div class="col-6"></div>
                 <q-checkbox
                   :disable="state.task_type === 'runonce'"
diff --git a/web/src/views/Dashboard.vue b/web/src/views/Dashboard.vue
index 3be286ac4b..228160c64d 100644
--- a/web/src/views/Dashboard.vue
+++ b/web/src/views/Dashboard.vue
@@ -688,7 +688,6 @@ export default {
         .catch(() => {});
     },
     getClientIntegrations(node){
-<<<<<<< HEAD
       this.$axios
         .get("clients/" + node.id + "/")
         .then(r => {
@@ -698,30 +697,6 @@ export default {
         .catch((e) => {
             console.log(e)
         });
-=======
-      console.log(node)
-        this.$axios
-          .get("/integrations/")
-          .then(r => {
-            let integrations = []
-
-            if (r.data.length > 0){
-              for(let integrationObj of r.data){
-                  if(integrationObj.enabled && integrationObj.client_org_related){
-                    integrations.push(integrationObj)
-                  }
-                }
-            
-            }
-                                  this.$q.dialog({
-                    component: ClientIntegrations,
-                    componentProps: {
-                      node: node,
-                      integrations: integrations,
-                    }
-            })
-    })
->>>>>>> allow Meraki integration dashboard at client level as well as agent
     }
   },
   computed: {