adds table category + associations
fixes merge conflict
drops and migrates database