Visit default_scope if necessary when merging.

Fixes #214
Don't call nonexistent with_default_scope in 3.0
Update CHANGELOG