added search functionality
merge conflict