diff --git a/src/datasources/category-api.ts b/src/datasources/category-api.ts
index 82658e6..fff2793 100644
--- a/src/datasources/category-api.ts
+++ b/src/datasources/category-api.ts
@@ -57,8 +57,6 @@ WHERE product_category.product_id = ?
         };
       });
   }
-<<<<<<< Updated upstream
-=======
 
   /**
    * category keywords
@@ -74,5 +72,4 @@ JOIN keywords ON category_keyword.keyword_id = keywords.id;
 
 *
    */
->>>>>>> Stashed changes
 }