From f0768b273cadffeac7e8ab5d89e0991f2a619efd Mon Sep 17 00:00:00 2001
From: Guillaume Blaquiere <guillaume.blaquiere@gmail.com>
Date: Fri, 8 Oct 2021 21:04:48 +0200
Subject: [PATCH] chore: merge/resolve conflict

---
 google/google.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google/google.go b/google/google.go
index 604edf5..0465d19 100644
--- a/google/google.go
+++ b/google/google.go
@@ -201,7 +201,7 @@ func (f *credentialsFile) tokenSource(ctx context.Context, params CredentialsPar
 			Ts:        oauth2.ReuseTokenSource(nil, ts),
 			Delegates: f.Delegates,
 		}
-		return oauth2.ReuseTokenSource(nil, imp), nil
+		return imp, nil
 	case "":
 		return nil, errors.New("missing 'type' field in credentials")
 	default: