Added  the search widget and resolved all the conflicts