Edit, destroy and index implementation of Categories
Resolve conflicts