diff --git a/internal/googleapi/service_account_test.go b/internal/googleapi/service_account_test.go
index 6cdcfe8..8c4dda6 100644
--- a/internal/googleapi/service_account_test.go
+++ b/internal/googleapi/service_account_test.go
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package googleapi
 
 import (