Live searching implemented
conflict resolved