fix bad merging

I chose the wrong versions when resolving conflicts during merge request !1 (merged). This generates bugs related to the now-absence f dnafeat_categories table.