fixed merge conflict on search bar multiple