search modified
Fixed few conflicts