diff --git a/pkg/modules/tracefunnel/impltracefunnel/handler_test.go b/pkg/modules/tracefunnel/impltracefunnel/handler_test.go
index 2a622839ba..06df5d31f4 100644
--- a/pkg/modules/tracefunnel/impltracefunnel/handler_test.go
+++ b/pkg/modules/tracefunnel/impltracefunnel/handler_test.go
@@ -3,6 +3,10 @@ package impltracefunnel
 import (
 	"context"
 	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
@@ -10,9 +14,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"net/http"
-	"net/http/httptest"
-	"testing"
 )
 
 type MockModule struct {
diff --git a/pkg/modules/tracefunnel/impltracefunnel/module.go b/pkg/modules/tracefunnel/impltracefunnel/module.go
index d9ac406e80..b53ffb42c6 100644
--- a/pkg/modules/tracefunnel/impltracefunnel/module.go
+++ b/pkg/modules/tracefunnel/impltracefunnel/module.go
@@ -3,9 +3,9 @@ package impltracefunnel
 import (
 	"context"
 	"fmt"
-	"github.com/SigNoz/signoz/pkg/modules/tracefunnel"
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/modules/tracefunnel"
 	"github.com/SigNoz/signoz/pkg/types"
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
diff --git a/pkg/modules/tracefunnel/impltracefunnel/store.go b/pkg/modules/tracefunnel/impltracefunnel/store.go
index 04a4a13f61..f0c2b119b5 100644
--- a/pkg/modules/tracefunnel/impltracefunnel/store.go
+++ b/pkg/modules/tracefunnel/impltracefunnel/store.go
@@ -2,9 +2,9 @@ package impltracefunnel
 
 import (
 	"context"
-	"github.com/SigNoz/signoz/pkg/errors"
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/sqlstore"
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
diff --git a/pkg/modules/tracefunnel/tracefunneltest/module_test.go b/pkg/modules/tracefunnel/tracefunneltest/module_test.go
index e368c9648f..0379027669 100644
--- a/pkg/modules/tracefunnel/tracefunneltest/module_test.go
+++ b/pkg/modules/tracefunnel/tracefunneltest/module_test.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/modules/tracefunnel/impltracefunnel"
-
 	"github.com/SigNoz/signoz/pkg/types"
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
diff --git a/pkg/signoz/handler.go b/pkg/signoz/handler.go
index 107c782033..6f5ccdce98 100644
--- a/pkg/signoz/handler.go
+++ b/pkg/signoz/handler.go
@@ -16,12 +16,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/tracefunnel"
 	"github.com/SigNoz/signoz/pkg/modules/tracefunnel/impltracefunnel"
 	"github.com/SigNoz/signoz/pkg/modules/user"
-<<<<<<< HEAD
 	"github.com/SigNoz/signoz/pkg/modules/user/impluser"
-	"github.com/SigNoz/signoz/pkg/modules/tracefunnel"
-	"github.com/SigNoz/signoz/pkg/modules/tracefunnel/impltracefunnel"
-=======
->>>>>>> aa167937f (fix: minor fixes)
 )
 
 type Handlers struct {
@@ -39,11 +34,7 @@ func NewHandlers(modules Modules) Handlers {
 	return Handlers{
 		Organization: implorganization.NewHandler(modules.OrgGetter, modules.OrgSetter),
 		Preference:   implpreference.NewHandler(modules.Preference),
-<<<<<<< HEAD
 		User:         impluser.NewHandler(modules.User),
-=======
-		User:         user,
->>>>>>> aa167937f (fix: minor fixes)
 		SavedView:    implsavedview.NewHandler(modules.SavedView),
 		Apdex:        implapdex.NewHandler(modules.Apdex),
 		Dashboard:    impldashboard.NewHandler(modules.Dashboard),