fix readme conflict