Merge with settings from desktop