Add category to entry meta using get_the_category
Merge conflict in entry-meta.php