fix: resolve file conflicts

api/src/nlp/controllers/nlp-entity.controller.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -167,17 +167,7 @@ export class NlpEntityController extends BaseController<
       );
     }
 
-    const result = await this.nlpEntityService.updateOne(
-      id,
-      updateNlpEntityDto,
-    );
-    if (!result) {
-      this.logger.warn(`Failed to update NLP Entity by id ${id}`);
-      throw new InternalServerErrorException(
-        `Failed to update NLP Entity with ID ${id}`,
-      );
-    }
-    return result;
+    return await this.nlpEntityService.updateOne(id, updateNlpEntityDto);
   }
 
   /**