diff --git a/internal/config/config.go b/internal/config/config.go
index 9714deeef16..f0063a59c44 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -140,8 +140,13 @@ func (c *AuthConfig) Token(hostname string) (string, string) {
 	return token, source
 }
 
+<<<<<<< Updated upstream
 // HasEnvOrConfigToken checks whether the current env or config contains a token.
 func (c *AuthConfig) HasEnvOrConfigToken() bool {
+=======
+// HasEnvToken checks whether the current env or config contains a token
+func (c *AuthConfig) HasEnvToken() bool {
+>>>>>>> Stashed changes
 	// This will check if there are any environment variable
 	// authentication tokens set for enterprise hosts.
 	// Any non-github.com hostname is fine here