Added category merge/reset

Fixes #1909