[XAPID-1002] resolve conflicts

init.go

diff --git a/init.go b/init.go
index 32be608..3e8121a 100644
--- a/init.go
+++ b/init.go
@@ -127,7 +127,7 @@
 		},
 	}
 	apidClusterId = config.GetString(configApidClusterID)
-	
+
 
 	client := &trackerClient{
 		trackerBaseUrl: configApiServerBaseURI,