removed merge conflicts on categories controller