save search changes

Signed-off-by: jiml <jiml.webdev@gmail.com>
resolve merge conflict