adding search
corrected conflicts