another merge conflict

Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>

server/handle_server_create_session.go

···
 	if repo.TwoFactorType != models.TwoFactorTypeNone && (req.AuthFactorToken == nil || *req.AuthFactorToken == "") {
 		err = s.createAndSendTwoFactorCode(ctx, repo)
 		if err != nil {
-			s.logger.Error("sending 2FA code", "error", err)
+			logger.Error("sending 2FA code", "error", err)
 			return helpers.ServerError(e, nil)
 		}
 
···
 		if repo.TwoFactorCode == nil || repo.TwoFactorCodeExpiresAt == nil {
 			err = s.createAndSendTwoFactorCode(ctx, repo)
 			if err != nil {
-				s.logger.Error("sending 2FA code", "error", err)
+				logger.Error("sending 2FA code", "error", err)
 				return helpers.ServerError(e, nil)
 			}