changed README
conflict resolved attempt 1