almost fixed features for merge
fix categories create and edit bug