fix merge bug; entity search.

fix merge bug;
entity search.