diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 7305080..4e0e044 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -51,4 +51,4 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
     implementation(platform("com.google.firebase:firebase-bom:34.12.0"))
     implementation("com.google.firebase:firebase-messaging")
-}
+}
\ No newline at end of file
diff --git a/lib/presentation/screens/chat_screen.dart b/lib/presentation/screens/chat_screen.dart
index 921e22b..24aa08e 100644
--- a/lib/presentation/screens/chat_screen.dart
+++ b/lib/presentation/screens/chat_screen.dart
@@ -2149,8 +2149,13 @@ class _ChatScreenState extends State<ChatScreen> with RouteAware {
         previewText = rawText;
       } else if (hasMedia) {
         previewText = switch (messageType) {
+<<<<<<< HEAD
           MessageType.videoNote => "[Кружок]",
           MessageType.voiceNote => "[Голосовое]",
+=======
+          MessageType.voiceNote => "[Кружок}",
+          MessageType.videoNote => "[Голосовое]",
+>>>>>>> 4b306f3ceef54b88bb73fa4130a0e501641e6ca8
           MessageType.image => "[Фото]",
           MessageType.video => "[Видео]",
           MessageType.file => "[Файл]",