fix: Resovle merge conflicts

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -258,6 +258,10 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         return serviceDispatchingAndroidInjector
     }
 
+    override fun broadcastReceiverInjector(): AndroidInjector<BroadcastReceiver> {
+        return broadcastReceiverInjector
+    }
+
     companion object {
         var context: WeakReference<Context>? = null
         fun getAppContext(): Context? {

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -233,14 +233,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             // TODO - use a ViewModel Mapper instead of using settings on the adapter
 
             val baseAdapter = ChatRoomsAdapter(this,
-                    settingsRepository.get(serverInteractor.get()!!)) { chatRoom ->
-            recycler_view.adapter = ChatRoomsAdapter(
-                    this,
-                    settingsRepository.get(serverInteractor.get()!!), localRepository) { chatRoom ->
-                presenter.loadChatRoom(chatRoom)
-            }
-            baseAdapter = ChatRoomsAdapter(this,
-                    settingsRepository.get(serverInteractor.get()!!)) { chatRoom -> presenter.loadChatRoom(chatRoom) }
+                    settingsRepository.get(serverInteractor.get()!!), localRepository) { chatRoom -> presenter.loadChatRoom(chatRoom) }
 
             sectionedAdapter = SimpleSectionedRecyclerViewAdapter(this, R.layout.item_chatroom_header, R.id.text_chatroom_header, baseAdapter!!)
             recycler_view.adapter = sectionedAdapter