Year and category filtering functionality
Resolve conflicts