search fix
fixed conflict