From bf3e31c59ad6b4cecc820eb3a4fdbab04597e343 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 23 Feb 2022 08:18:08 +0100
Subject: [PATCH] fix: [Component:CRUD] Typo in merge conflict

---
 src/Controller/Component/CRUDComponent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/Component/CRUDComponent.php b/src/Controller/Component/CRUDComponent.php
index e2159d1..d7b5419 100644
--- a/src/Controller/Component/CRUDComponent.php
+++ b/src/Controller/Component/CRUDComponent.php
@@ -461,7 +461,7 @@ class CRUDComponent extends Component
         if (!empty($params['conditions'])) {
              $query->where($params['conditions']);
         }
-        $data = $data->first();
+        $data = $query->first();
         if (isset($params['afterFind'])) {
             $data = $params['afterFind']($data, $params);
         }