fix edit page
fix edit page
fix merge conflict
fix merge conflict
* Fixed catergories views and partial