skill search
fix merge error