Categorization template added
Settings file
merge conflict