search functionality
resolved merge conflict