fix conflicts

Author: Godmartinz

tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php

@@ -31,12 +31,14 @@ public function testExpiringAssetsEmailNotification()
              'archived' => 0,
              'deleted_at' => null,
          ]);
+
          $expiredAsset = Asset::factory()->create([
              'purchase_date' => now()->subDays(370)->format('Y-m-d'),
              'warranty_months' => 12,
              'archived' => 0,
              'deleted_at' => null,
          ]);
+
          $notExpiringAsset = Asset::factory()->create([
              'purchase_date' => now()->subDays(330)->format('Y-m-d'),
              'warranty_months' => 12,