Update description

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,14 +33,15 @@ 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
     - Dark theme (controlled by system settings)
     - 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
 ```

fastlane/metadata/android/en-US/changelogs/20100.txt

@@ -1 +1 @@
-- Add merge screen to resolve conflicts with remote
+- Added a merge screen for synchronization conflicts. Review local and remote changes, select what to keep.

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

fastlane/metadata/android/uk-UA/full_description.txt

@@ -7,6 +7,7 @@
 Синхронізація:
  - Синхронізація з сервером WebDav
  - Синхронізація з репозиторієм Git (тільки через HTTPS, протокол SSH недоступний)
+ - Вирішення конфліктів синхронізації: переглядайте локальні та віддалені зміни й об'єднуйте ті, які бажаєте зберегти
 
 Управління базами даних:
  - Створення нових баз даних