add search
README conflict