diff --git a/packages/common/exceptions/http.exception.ts b/packages/common/exceptions/http.exception.ts
index 3bfb1140d..02431211b 100644
--- a/packages/common/exceptions/http.exception.ts
+++ b/packages/common/exceptions/http.exception.ts
@@ -2,13 +2,8 @@ export class HttpException extends Error {
   public readonly message: any;
 
   /**
-<<<<<<< HEAD
-   * The base Nest Application exception which is handled by the default Exceptions Handler.
-   * If you throw an exception from your HTTP route handlers, Nest will map them to the appropriate HTTP response and send to the client.
-=======
    * The base Nest Application exception, which is handled by the default Exceptions Handler.
    * If you throw an exception from your HTTP route handler, Nest will map them to the appropriate HTTP response and send to the client.
->>>>>>> master
    *
    * When `response` is an object:
    * - object will be stringified and returned to the user as a JSON response,