Fixed convention filters; broke merge buttons. Oy.
Fix merge mode issues.