Updating README from different clone
merging conflicts