making adding category for admin page
mergin conflicts admin.jinja2
mergin conflicts admin.jinja2