kill all search
merge confilict
merge confilict