Updating readme conflict