downsampled correctly
ds fix
 merged