fixed readme conflict