diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index a70a43e..8d3524b 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -42,14 +42,11 @@ include-file = ~/.config/polybar/user_modules.ini
 ; If unspecified, the application will pick the first one it finds.
 ; $ polybar -m | cut -d ':' -f 1
 ; $ xrandr -q | grep " connected" | cut -d ' ' -f1
-monitor = DP-0
+;monitor = DP-0
 
 ; Use the specified monitor as a fallback if the main one is not found.
-<<<<<<< HEAD
-monitor-fallback = eDP
-=======
-monitor-fallback = VGA-1
->>>>>>> 60e59f1ed9b6946945f4e26696feabdfd088fff6
+;monitor-fallback = eDP
+;monitor-fallback = VGA-1
 
 ; Require the monitor to be in connected state
 ; XRandR sometimes reports my monitor as being disconnected (when in use)