Filter functionality on search results and fix on navigation
Conflig resolution