diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index e46c738..463955e 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -28,13 +28,12 @@ xargs xwallpaper --stretch < ~/.cache/wall &
 # nitrogen --restore &
 
 #### MONITORS ####
-monitors=$(xrandr | grep " connected " | cut -f 1 -d " ")
-for x in "${monitors[@]}"
+for monitor in $(bspc query -M)
 do
     # set the workspaces on each monitor to 1-9
-    bspc monitor $x -d 1 2 3 4 5 6 7 8 9
+    bspc monitor $monitor -d 1 2 3 4 5 6 7 8 9
     #polybar hidden when fullscreen for vlc, youtube, mpv ...
-    xdo below -t $(xdo id -n root) $(xdo id -a polybar-main_"$x")
+    xdo below -t $(xdo id -n root) $(xdo id -a polybar-main_$monitor)
 done
 
 #polybar hidden when fullscreen for vlc, youtube, mpv ...
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 29059e3..9f41a70 100755
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -163,7 +163,7 @@ super + p; {r}
 super + p; {s}
     dm-websearch
 super + p; {t}
-    dm-translate}
+    dm-translate
 
 # emacs (SUPER + e followed by another key)
 super + e; e
diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
index 6abfa82..ffd0565 100644
--- a/.config/xmonad/xmonad.hs
+++ b/.config/xmonad/xmonad.hs
@@ -131,14 +131,9 @@ myStartupHook = do
   spawnOnce "notify-log $HOME/.log/notify.log"
   spawn "/usr/bin/emacs --daemon" -- emacs daemon for the emacsclient
 
-<<<<<<< HEAD
-  spawn ("sleep 2 && conky -c $HOME/.config/conky/xmonad/" ++ colorScheme ++ "-01.conkyrc")
-  spawn "polybar-xmonad"
-=======
   spawn "polybar-xmonad"
   spawnOnce "sleep 2 && xmonad --restart"
   spawn ("sleep 3 && conky -c $HOME/.config/conky/xmonad/" ++ colorScheme ++ "-01.conkyrc")
->>>>>>> 9d69b64ef8fc5b170a38aef63f94f6cad3fa989a
 
   spawnOnce "xargs xwallpaper --stretch < ~/.cache/wall"
   -- spawnOnce "~/.fehbg &"  -- set last saved feh wallpaper