Droplet Coalescence With and Without a Ridge