added search
conflict resolution