changed README
modified README
conflict