Made all categories upper case
merge