merge changes from desktop stup