updating README
merging conflicts