catalog page filters
conflic resolved