reformat some xmonad.hs
fix merge conflict