added more match categories
conflict resolved