fix merge error

oss/conn_test.go

@@ -2,6 +2,7 @@ package oss
 
 import (
 	"net/http"
+	"os"
 	"strings"
 	"time"