search feature added
merge conflict resolved