updating README
fixing merge problem