diff --git a/.config/xmonad/xmonad-with-polybar.org b/.config/xmonad/xmonad-with-polybar.org
index b950482..d18d5bd 100644
--- a/.config/xmonad/xmonad-with-polybar.org
+++ b/.config/xmonad/xmonad-with-polybar.org
@@ -65,7 +65,6 @@ import Data.Char (isSpace, toUpper)
 import Data.Maybe (fromJust)
 import Data.Monoid
 import Data.Maybe (isJust)
-import Data.Ratio  
 import Data.Tree
 import qualified Data.Map as M
 
@@ -73,7 +72,7 @@ import qualified Data.Map as M
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops  -- for some fullscreen events, also for xcomposite in obs.
 import XMonad.Hooks.ManageDocks (avoidStruts, docks, manageDocks, ToggleStruts(..))
-import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat, doCenterFloat, doRectFloat)
+import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat, doCenterFloat)
 import XMonad.Hooks.ServerMode
 import XMonad.Hooks.SetWMName
 import XMonad.Hooks.StatusBar
@@ -187,19 +186,11 @@ myStartupHook = do
   spawnOnce "volumeicon"
   spawnOnce "notify-log $HOME/.log/notify.log"
   spawn "/usr/bin/emacs --daemon" -- emacs daemon for the emacsclient
-<<<<<<< HEAD
-
-=======
->>>>>>> 10dba929669221d591cd1e0d58cc67ace8b03906
   -- We killed any running conky processes earlier in the autostart, 
   -- so now we sleep for 2 seconds and then restart conky.
   spawn "polybar-xmonad"
   spawnOnce "sleep 2 && xmonad --restart"
   spawn ("sleep 3 && conky -c $HOME/.config/conky/xmonad/" ++ colorScheme ++ "-01.conkyrc")
-<<<<<<< HEAD
-
-=======
->>>>>>> 10dba929669221d591cd1e0d58cc67ace8b03906
   -- Select only =ONE= of the following four ways to set the wallpaper.
   spawnOnce "xargs xwallpaper --stretch < ~/.cache/wall"
   -- spawnOnce "~/.fehbg &"  -- set last saved feh wallpaper
diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
index 359f820..18e0eba 100644
--- a/.config/xmonad/xmonad.hs
+++ b/.config/xmonad/xmonad.hs
@@ -21,7 +21,6 @@ import Data.Char (isSpace, toUpper)
 import Data.Maybe (fromJust)
 import Data.Monoid
 import Data.Maybe (isJust)
-import Data.Ratio  
 import Data.Tree
 import qualified Data.Map as M
 
@@ -29,7 +28,7 @@ import qualified Data.Map as M
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops  -- for some fullscreen events, also for xcomposite in obs.
 import XMonad.Hooks.ManageDocks (avoidStruts, docks, manageDocks, ToggleStruts(..))
-import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat, doCenterFloat, doRectFloat)
+import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat, doCenterFloat)
 import XMonad.Hooks.ServerMode
 import XMonad.Hooks.SetWMName
 import XMonad.Hooks.StatusBar
@@ -132,19 +131,11 @@ myStartupHook = do
   spawnOnce "volumeicon"
   spawnOnce "notify-log $HOME/.log/notify.log"
   spawn "/usr/bin/emacs --daemon" -- emacs daemon for the emacsclient
-<<<<<<< HEAD
-
-=======
->>>>>>> 10dba929669221d591cd1e0d58cc67ace8b03906
   -- We killed any running conky processes earlier in the autostart, 
   -- so now we sleep for 2 seconds and then restart conky.
   spawn "polybar-xmonad"
   spawnOnce "sleep 2 && xmonad --restart"
   spawn ("sleep 3 && conky -c $HOME/.config/conky/xmonad/" ++ colorScheme ++ "-01.conkyrc")
-<<<<<<< HEAD
-
-=======
->>>>>>> 10dba929669221d591cd1e0d58cc67ace8b03906
   -- Select only =ONE= of the following four ways to set the wallpaper.
   spawnOnce "xargs xwallpaper --stretch < ~/.cache/wall"
   -- spawnOnce "~/.fehbg &"  -- set last saved feh wallpaper