small progress
manage categories
solve conflict