merge with upstream, remove sddm