diff --git a/task.md b/task.md
index 3a43b22..78e8851 100644
--- a/task.md
+++ b/task.md
@@ -43,6 +43,6 @@ Master Plan:
 
 ## 🔧 Git Maintenance
 
-- [ ] **Resolve Conflicts**:
-  - [ ] `bin/api/streaming_handler.dart`
-  - [ ] `lib/features/iptv/services/xtream_service.dart`
+- [x] **Resolve Conflicts**:
+  - [x] `bin/api/streaming_handler.dart`
+  - [x] `lib/features/iptv/services/xtream_service.dart`