working category filter
fixing merge conflict