updating readme conflict