Desktop updates and merge with mobile code