diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index b796b5955..3a24c657e 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -143,7 +143,7 @@ class CommonConfiguration: NSObject, Configurable {
     #else
         return nil
     #endif
->>>>>>> 7f488705214bbb905bb50f2485ac3aa880c9e8b7
+        
     }
     
     
diff --git a/Podfile b/Podfile
index ff67692e1..69413f80c 100644
--- a/Podfile
+++ b/Podfile
@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
 $matrixSDKVersionSpec = $matrixSDKVersion
 end
 
-$matrixSDKVersionSpec = { :git => 'https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk', :tag => 'v0.23.18_bwi' }
+$matrixSDKVersionSpec = { :git => 'https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk', :tag => 'v0.24.0_bwi_dev' }
 
 # Method to import the MatrixSDK
 def import_MatrixSDK
diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift
index 7c462f71d..b222241ee 100644
--- a/Riot/Generated/Images.swift
+++ b/Riot/Generated/Images.swift
@@ -136,7 +136,6 @@ internal class Asset: NSObject {
     internal static let roomActionPriorityHigh = ImageAsset(name: "room_action_priority_high")
     internal static let roomActionPriorityLow = ImageAsset(name: "room_action_priority_low")
     internal static let roomActionResttime = ImageAsset(name: "room_action_resttime")
-
     internal static let allChatsEditIcon = ImageAsset(name: "all_chats_edit_icon")
     internal static let allChatsEmptyListPlaceholderIcon = ImageAsset(name: "all_chats_empty_list_placeholder_icon")
     internal static let allChatsEmptyScreenArtwork = ImageAsset(name: "all_chats_empty_screen_artwork")
diff --git a/Riot/target-bum-beta.yml b/Riot/target-bum-beta.yml
index ac4a327fb..46c105fd7 100644
--- a/Riot/target-bum-beta.yml
+++ b/Riot/target-bum-beta.yml
@@ -45,6 +45,7 @@ targets:
     - package: Mapbox
     - package: OrderedCollections
     - package: SwiftOGG
+    - package: DeviceKit
 
     configFiles:
       Debug: Debug.xcconfig
diff --git a/Riot/target-messenger.yml b/Riot/target-messenger.yml
index 2d715e400..6da867c8f 100644
--- a/Riot/target-messenger.yml
+++ b/Riot/target-messenger.yml
@@ -45,6 +45,7 @@ targets:
     - package: Mapbox
     - package: OrderedCollections
     - package: SwiftOGG
+    - package: DeviceKit
 
     configFiles:
       Debug: Debug.xcconfig
diff --git a/bwi/SplashScreen/OnboardingBwiSplashScreenViewModel.swift b/bwi/SplashScreen/OnboardingBwiSplashScreenViewModel.swift
index 1e88897e1..751ed2778 100644
--- a/bwi/SplashScreen/OnboardingBwiSplashScreenViewModel.swift
+++ b/bwi/SplashScreen/OnboardingBwiSplashScreenViewModel.swift
@@ -19,7 +19,6 @@ import Combine
 
 @available(iOS 14, *)
 typealias OnboardingBwiSplashScreenViewModelType = StateStoreViewModel<OnboardingBwiSplashScreenViewState,
-                                                                    Never,
                                                                     OnboardingBwiSplashScreenViewAction>
 
 protocol OnboardingBwiSplashScreenViewModelProtocol {