hyperbar for categories
hyberbar for categories
fixed conflicts