From 9c93d379a82428c27c50034a8ecd7eb36336e575 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 5 Jun 2023 12:38:35 -0400
Subject: [PATCH] Fix a sneaky merge conflict

---
 .../org/whispersystems/textsecuregcm/storage/AccountsTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsTest.java
index 3327c2dd5..101ff7f05 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsTest.java
@@ -154,7 +154,8 @@ public void testUsernameLinksViaAccountsManager() throws Exception {
         accounts,
         mock(PhoneNumberIdentifiers.class),
         mock(FaultTolerantRedisCluster.class),
-        mock(DeletedAccountsManager.class),
+        mock(AccountLockManager.class),
+        mock(DeletedAccounts.class),
         mock(Keys.class),
         mock(MessagesManager.class),
         mock(ProfilesManager.class),