diff --git a/src/features/catalogs/catalogs/catalog.service.js b/src/features/catalogs/catalogs/catalog.service.js
index fc66c4c..492f0dd 100644
--- a/src/features/catalogs/catalogs/catalog.service.js
+++ b/src/features/catalogs/catalogs/catalog.service.js
@@ -4,10 +4,6 @@ import { SocketService } from '../../../shared/services/socket.service.js';
 import { AuditService } from '../../../shared/services/audit.service.js';
 import { ApiError } from '../../../utils/helpers/ApiError.utils.js';
 import { generateUniqueCode } from '../../../utils/helpers/code.utils.js';
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/mahir_backend
 
 export class CatalogService {
   async attachCounts(record, transaction) {
diff --git a/src/features/channels/channelTypes/channelType.service.js b/src/features/channels/channelTypes/channelType.service.js
index 5c0c5c2..26b5b28 100644
--- a/src/features/channels/channelTypes/channelType.service.js
+++ b/src/features/channels/channelTypes/channelType.service.js
@@ -2,10 +2,7 @@ import repository from './channelType.repository.js';
 import { models } from '../../../shared/database/models.js';
 import { SocketService } from '../../../shared/services/socket.service.js';
 import { AuditService } from '../../../shared/services/audit.service.js';
-<<<<<<< HEAD
 import { ApiError } from '../../../utils/helpers/ApiError.utils.js';
-=======
->>>>>>> origin/mahir_backend
 import { generateUniqueCode } from '../../../utils/helpers/code.utils.js';
 
 export class ChannelTypeService {