added 9 category groups
resovled conflicts