Fix wda snippet weirdness.
Resolve merge conflicts.