Resolve conflicts

Signed-off-by: Akshay Gaikwad <akgaikwad001@gmail.com>

scripts/initialize/main.go

@@ -303,13 +303,6 @@ retry:
 	_, err = us.Create(context.Background(), &userv3.User{
 		Metadata: &commonv3.Metadata{Name: *oae, Partner: *partner, Organization: *org},
 		Spec: &userv3.UserSpec{
-
-			// FirstName:             *oafn,
-			// LastName:              *oaln,
-			// Password:              utils.GetRandomPassword(8),
-			// Groups:                []string{admingrp.Metadata.Name, localUsersGrp.Metadata.Name},
-			// ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Role: "ADMIN", Group: &admingrp.Metadata.Name}}},
-
 			FirstName: *oafn,
 			LastName:  *oaln,
 			Password:  utils.GetRandomPassword(8),