Fixed merge issue with Category