Add search
Fix merge conflict