search is working
merging