diff --git a/lib/features/iptv/screens/player_screen.dart b/lib/features/iptv/screens/player_screen.dart
index 67845ed..15bd6b2 100644
--- a/lib/features/iptv/screens/player_screen.dart
+++ b/lib/features/iptv/screens/player_screen.dart
@@ -264,13 +264,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
     final docElement = document.documentElement;
     
     if (_isFullscreen) {
-      // Exit fullscreen
       document.exitFullscreen();
       setState(() {
         _isFullscreen = false;
       });
     } else {
-      // Enter fullscreen
       docElement?.requestFullscreen();
       setState(() {
         _isFullscreen = true;
@@ -807,7 +805,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                               ),
                             ),
 
+<<<<<<< HEAD
                             // Playback Controls (Centered Row: Previous - Play/Pause - Next)
+=======
+                            // Playback Controls (Centered Row: Previous - Play/Pause - Next - Fullscreen)
+>>>>>>> antigravity
                             Positioned(
                               top: null,
                               bottom: 150,
@@ -950,8 +952,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                                   ),
                                 ),
                               ),
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> antigravity
                               
                             // EPG Overlay
                             if (widget.streamType == StreamType.live)