updates in concept retrieval
conflict resolved