diff --git a/README.md b/README.md
index bb291c59..817c1a78 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Android client app for KeePass databases.
 - Synchronization:
     - Sync with WebDav server
     - Sync with Git repository (via HTTPS and SSH)
+    - Resolve synchronization conflicts by reviewing local and remote changes and merging the changes you want to keep
 
 - Database Management:
     - Create new databases
@@ -32,6 +33,7 @@ Android client app for KeePass databases.
 
 - File Compatibility:
     - Supports .kdbx files up to version 4.1
+    - Uses two libraries for encoding and decoding KeePass files: [Kotpass](https://github.com/keemobile/kotpass) and [keepass-rs](https://github.com/sseemayer/keepass-rs)
 
 - User Convenience:
     - Autofill for Android >= 8.0
@@ -39,7 +41,7 @@ Android client app for KeePass databases.
     - Fuzzy search for easy finding of entries
 
 # Screenshots
-<img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="200"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="200"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="200"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" width="200">
+<img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="160"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="160"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="160"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" width="160"><img src="https://github.com/aivanovski/keepassvault/blob/master/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png" width="160">
 
 # License
 ```
diff --git a/fastlane/metadata/android/en-US/changelogs/20100.txt b/fastlane/metadata/android/en-US/changelogs/20100.txt
index 3387e687..a57de404 100644
--- a/fastlane/metadata/android/en-US/changelogs/20100.txt
+++ b/fastlane/metadata/android/en-US/changelogs/20100.txt
@@ -1 +1 @@
-- Add merge screen to resolve conflicts with remote
\ No newline at end of file
+- Added a merge screen for synchronization conflicts. Review local and remote changes, select what to keep.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index f4c0dbff..693e0c8d 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -7,6 +7,7 @@ Application Features:
 Synchronization:
  - Sync with WebDav server
  - Sync with Git repository (only via HTTPS, SSH protocol is not available)
+ - Resolve synchronization conflicts by reviewing local and remote changes
 
 Database Management:
  - Create new databases
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
index ba76269d..113edad0 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
index d6b45d38..9886e99a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
index 66963a8c..3fc67902 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
index cb0c0c28..7c44696a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
index c06026fe..983f9958 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
index e0580bb4..d53c5ee8 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png differ
diff --git a/fastlane/metadata/android/uk-UA/full_description.txt b/fastlane/metadata/android/uk-UA/full_description.txt
index 8d5fa5f1..2e2eda89 100644
--- a/fastlane/metadata/android/uk-UA/full_description.txt
+++ b/fastlane/metadata/android/uk-UA/full_description.txt
@@ -7,6 +7,7 @@
 Синхронізація:
  - Синхронізація з сервером WebDav
  - Синхронізація з репозиторієм Git (тільки через HTTPS, протокол SSH недоступний)
+ - Вирішення конфліктів синхронізації: переглядайте локальні та віддалені зміни й об'єднуйте ті, які бажаєте зберегти
 
 Управління базами даних:
  - Створення нових баз даних