From 392803b5e88fcdd4d15aab035e21d833cda44df2 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 13 Feb 2025 19:24:00 +0000
Subject: [PATCH] chore: fix merge conflicts

---
 app/controllers/general.php    | 2 +-
 app/controllers/shared/api.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 324de05e6e..ea27e8633e 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -775,7 +775,7 @@ App::error()
     ->inject('project')
     ->inject('logger')
     ->inject('log')
-    ->inject('queueForUsage')
+    ->inject('queueForStatsUsage')
     ->inject('devKey')
     ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, StatsUsage $queueForStatsUsage) {
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 43a1d88536..9dd804ea2f 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -441,7 +441,7 @@ App::init()
     ->inject('timelimit')
     ->inject('mode')
     ->inject('devKey')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, callable $timelimit, string $mode, Document $devKey) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, Document $devKey) use ($usageDatabaseListener, $eventDatabaseListener) {
 
         $route = $utopia->getRoute();