Fix rebase

vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt

@@ -93,7 +93,7 @@ class UserListFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        recyclerView.cleanup()
+        userListRecyclerView.cleanup()
         super.onDestroyView()
     }
 
@@ -115,7 +115,7 @@ class UserListFragment @Inject constructor(
     private fun setupRecyclerView() {
         userListController.callback = this
         // Don't activate animation as we might have way to much item animation when filtering
-        recyclerView.configureWith(userListController, disableItemAnimation = true)
+        userListRecyclerView.configureWith(userListController, disableItemAnimation = true)
     }
 
     private fun setupSearchView() {

vector/src/main/res/layout/fragment_user_list.xml

@@ -122,7 +122,7 @@
             tools:visibility="visible" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/knownUsersRecyclerView"
+            android:id="@+id/userListRecyclerView"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:fastScrollEnabled="true"