diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index e218a76d1a..44708220aa 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -2,6 +2,7 @@
 
 namespace App\Notifications;
 
+use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\User;
diff --git a/resources/lang/en/admin/reports/general.php b/resources/lang/en/admin/reports/general.php
index ad3b0f5df1..344d5c8743 100644
--- a/resources/lang/en/admin/reports/general.php
+++ b/resources/lang/en/admin/reports/general.php
@@ -1,16 +1,10 @@
 <?php
 
-<<<<<<< HEAD
 return [
     'info'   => 'Select the options you want for your asset report.',
-];
-=======
-return array(
-    'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request'
-);
->>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added
+];
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 1623277518..96f638f28d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -332,7 +332,7 @@ Route::group(['middleware' => ['auth']], function () {
     )->name('reports/unaccepted_assets_delete');
     Route::post(
         'reports/unaccepted_assets/{deleted?}',
-        [ReportsController::class, 'exportAssetAcceptanceReport']
+        [ReportsController::class, 'postAssetAcceptanceReport']
     )->name('reports/export/unaccepted_assets');
 });