search with data
merge conflicts resolved