merged so now Download works