admin panel search is fixed
conflicts solved