Fix merge error

common/log/access.go

@@ -3,7 +3,6 @@ package log
 import (
 	"context"
 	"strings"
-	"context"
 
 	"v2ray.com/core/common/serial"
 )
@@ -57,5 +56,5 @@ func AccessMessageFromContext(ctx context.Context) *AccessMessage {
 	if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok {
 		return accessMessage
 	}
-	return nil 
+	return nil
 }