merge
merge
fixed recursive search