added search functionality
fixed merge conflict