diff --git a/src/types/index.ts b/src/types/index.ts
index 099f748..7d3febb 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -517,16 +517,6 @@ export interface ManualCheckResponse {
   new_status: string | null
 }
 
-<<<<<<< HEAD
-// Ticket notification types
-export interface TicketNotification {
-  id: number
-  ticket_id: number
-  notification_type: string
-  message: string
-  is_read: boolean
-  created_at: string
-=======
 // Ticket notifications types
 export interface TicketNotification {
   id: number
@@ -536,25 +526,17 @@ export interface TicketNotification {
   is_read: boolean
   created_at: string
   read_at: string | null
->>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076
 }
 
 export interface TicketNotificationList {
   items: TicketNotification[]
-<<<<<<< HEAD
-  total: number
-=======
   unread_count: number
->>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076
 }
 
 export interface UnreadCountResponse {
   unread_count: number
 }
-<<<<<<< HEAD
-=======
 
-// Extended TicketSettings with cabinet notifications
 export interface TicketSettings {
   sla_enabled: boolean
   sla_minutes: number
@@ -564,4 +546,3 @@ export interface TicketSettings {
   cabinet_user_notifications_enabled: boolean
   cabinet_admin_notifications_enabled: boolean
 }
->>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076