merge conflict again?
delete public categories