sidebar event
conflict

Conflicts:
	application/views/templates/category_page_1.php