fix wrong merge for admin/catetory/index