added search
merge