merge changes from server script to desktop and laptop scripts