fixed merge errors in finder.cc
fixed merge errors in finder.cc

sikuli/sikuli,sikuli/sikuli,bx5974/sikuli,bx5974/sikuli,sikuli/sikuli,bx5974/sikuli,bx5974/sikuli,sikuli/sikuli,bx5974/sikuli,bx5974/sikuli,sikuli/sikuli,sikuli/sikuli,bx5974/sikuli,sikuli/sikuli