diff --git a/libs/auth/env.go b/libs/auth/env.go
index ddf73c986..08282e463 100644
--- a/libs/auth/env.go
+++ b/libs/auth/env.go
@@ -4,10 +4,6 @@ import (
 	"fmt"
 	"os"
 	"slices"
-<<<<<<< HEAD
-	"sort"
-=======
->>>>>>> origin
 	"strings"
 
 	"github.com/databricks/databricks-sdk-go/config"