diff --git a/backend/core/celery_app.py b/backend/core/celery_app.py
index 55ba6651..9b292943 100644
--- a/backend/core/celery_app.py
+++ b/backend/core/celery_app.py
@@ -29,13 +29,10 @@ celery_app.conf.update(
         "api.v1.modules.a76.reports.exportacion.transmission.MAINX30.task",
         "api.v1.modules.a76.reports.importacion.transmission.temporal.MAINX30.task",
         "api.v1.modules.a76.reports.importacion.transmission.definitive.MAINX30.task",
-<<<<<<< HEAD
         "api.v1.modules.a76.reports.importacion.winsaai.invoices.task",
         "api.v1.modules.a76.reports.importacion.winsaai.pedimentos.task",
         "api.v1.modules.core.help_center.tasks",
-=======
         "api.v1.modules.core.help_center.tasks"
->>>>>>> 3e0072897d22dc9ee7ebbc3be471aab2aecb46f6
     ]  # Ruta al módulo donde están las tareas
 )