diff --git a/pkg/service/project_test.go b/pkg/service/project_test.go
index fab3d23..f99ec11 100644
--- a/pkg/service/project_test.go
+++ b/pkg/service/project_test.go
@@ -21,13 +21,8 @@ func TestCreateProject(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -53,13 +48,8 @@ func TestCreateProjectDuplicate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	gs := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	gs := NewProjectService(db, &mazc)
-	defer gs.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()
 
@@ -81,13 +71,8 @@ func TestProjectDelete(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()
 
@@ -110,13 +95,8 @@ func TestProjectDeleteNonExist(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()
 
@@ -136,13 +116,8 @@ func TestProjectGetByName(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	partuuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -170,13 +145,8 @@ func TestProjectGetById(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()
 
@@ -197,13 +167,8 @@ func TestProjectUpdate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-<<<<<<< Updated upstream
-	ps := NewProjectService(db)
-=======
 	mazc := mockAuthzClient{}
 	ps := NewProjectService(db, &mazc)
-	defer ps.Close()
->>>>>>> Stashed changes
 
 	puuid := uuid.New().String()