updating setup_desktop
merging and finishing desktop_setup