SchildiChat/SchildiChat-android @ Weblate

Language	Translated	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
English Apache-2.0		0	0	0	0	24	0	1

Basque Apache-2.0	31%	106	497	2,994	106	0	0	0

Bulgarian Apache-2.0	1%	153	702	4,267	153	0	0	0

Chinese (Simplified) Apache-2.0	86%	21	76	506	21	1	0	0

Chinese (Traditional) Apache-2.0	0%	155	705	4,290	155	0	0	0

Czech Apache-2.0		0	0	0	0	0	0	0

Dutch Apache-2.0	56%	67	338	2,080	67	5	0	0

Estonian Apache-2.0	31%	106	497	2,994	106	0	0	0

French Apache-2.0	67%	51	312	1,929	51	5	0	0

German Apache-2.0	96%	6	22	152	6	5	1	0

Hungarian Apache-2.0	31%	106	497	2,994	106	0	0	0

Indonesian Apache-2.0		0	0	0	0	7	0	0

Italian Apache-2.0	7%	144	662	4,020	144	0	0	0

Lithuanian Apache-2.0		0	0	0	0	0	0	0

Norwegian Bokmål Apache-2.0	64%	55	365	2,203	55	4	0	0

Persian Apache-2.0	1%	154	704	4,282	154	0	0	0

Polish Apache-2.0	9%	141	633	3,823	141	0	0	0

Portuguese (Brazil) Apache-2.0	69%	47	192	1,218	47	3	0	0

Romanian Apache-2.0	60%	61	352	2,187	61	4	0	0

Russian Apache-2.0	73%	41	215	1,345	41	1	0	0

Slovak Apache-2.0	31%	106	497	2,994	106	0	0	0

Spanish Apache-2.0	63%	56	253	1,574	56	1	0	0

Swedish Apache-2.0	98%	3	13	96	3	11	0	0

Turkish Apache-2.0	94%	8	33	225	8	1	0	0

Vietnamese Apache-2.0	58%	64	365	2,259	64	1	0	0

Please sign in to see the alerts.

Overview

Project website	schildi.chat
Project maintainers	SpiritCroc su-ex
Translation process	Translations can be made directly. Translation suggestions can be made. Any authenticated user can contribute. The translation uses monolingual files. The translation base language is editable.
Translation license	Apache License 2.0
Source code repository	`https://github.com/SchildiChat/SchildiChat-android.git`
Repository branch	sc
Last remote commit	[merge] Never show Element's release notes `00e5853081` SpiritCroc authored 4 days ago
Last commit in Weblate	[merge] Never show Element's release notes `00e5853081` SpiritCroc authored 4 days ago
Weblate repository	`https://weblate.bubu1.eu/git/schildichat/schildichat-android/`
File mask	`library/ui-strings/src/main/res/values-*/strings_sc.xml`
Monolingual base language file	`library/ui-strings/src/main/res/values/strings_sc.xml`

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		3,875		17,625		107,250
Source		155		705		4,290
Translated	57%	2,224	55%	9,695	54%	58,818
Needs editing	0%	0	0%	0	0%	0
Read-only	0%	0	0%	0	0%	0
Failing checks	1%	73	1%	346	2%	2,185
Strings with suggestions	1%	1	1%	2	1%	10
Untranslated strings	42%	1,651	44%	7,930	45%	48,432

Last 12 months Previous

Activity in last 12 months


Sep	Oct	Nov	Dec	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug

Quick numbers

17,625

Hosted words

3,875

Hosted strings

57%

Translated

Contributors

and previous 30 days

Trends of last 30 days

+1%

Hosted words

—

+1%

Hosted strings

—

+2%

Translated

+1%

+33%

Contributors

−25%

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2022-08-28 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2022-08-28 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

SpiritCroc Rebased repository SchildiChat / SchildiChat-android	Rebased repository 17 hours ago
SpiritCroc Component unlocked SchildiChat / SchildiChat-android	Component unlocked 17 hours ago
None Failed rebase on repository SchildiChat / SchildiChat-android	Rebasing (1/11093) Auto-merging .github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .idea/codeStyles/Project.xml CONFLICT (add/add): Merge conflict in .idea/codeStyles/Project.xml Auto-merging .idea/dictionaries/bmarty.xml CONFLICT (add/add): Merge conflict in .idea/dictionaries/bmarty.xml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging AUTHORS.md CONFLICT (add/add): Merge conflict in AUTHORS.md Auto-merging CHANGES.md CONFLICT (add/add): Merge conflict in CHANGES.md Auto-merging CONTRIBUTING.md CONFLICT (add/add): Merge conflict in CONTRIBUTING.md Auto-merging PRIVACY.md CONFLICT (add/add): Merge conflict in PRIVACY.md Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging alternative_package.sh CONFLICT (add/add): Merge conflict in alternative_package.sh Auto-merging attachment-viewer/build.gradle CONFLICT (add/add): Merge conflict in attachment-viewer/build.gradle Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt Auto-merging build.gradle CONFLICT (add/add): Merge conflict in build.gradle Auto-merging correct_strings.sh CONFLICT (add/add): Merge conflict in correct_strings.sh Auto-merging docs/jitsi.md CONFLICT (add/add): Merge conflict in docs/jitsi.md Auto-merging docs/notifications.md CONFLICT (add/add): Merge conflict in docs/notifications.md Auto-merging docs/signin.md CONFLICT (add/add): Merge conflict in docs/signin.md Auto-merging docs/ui-tests.md CONFLICT (add/add): Merge conflict in docs/ui-tests.md Auto-merging fastlane/metadata/android/de-DE/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/de-DE/full_description.txt Auto-merging fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/en-US/full_description.txt Auto-merging fastlane/metadata/android/ru-RU/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/ru-RU/full_description.txt Auto-merging gradle.properties CONFLICT (add/add): Merge conflict in gradle.properties Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging graphics/materialdesignicons/README.md CONFLICT (add/add): Merge conflict in graphics/materialdesignicons/README.md Auto-merging increment_version.sh CONFLICT (add/add): Merge conflict in increment_version.sh Auto-merging matrix-sdk-android-rx/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/build.gradle Auto-merging matrix-sdk-android-rx/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/AndroidManifest.xml Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt Auto-merging matrix-sdk-android/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android/build.gradle Auto-merging matrix-sdk-android/proguard-rules.pro CONFLICT (add/add): Merge conflict in matrix-sdk-android/proguard-rules.pro Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt Auto-merging matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt Auto-merging matrix-sdk-android/src/main/res/values-de/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-de/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-es/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-es/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-fi/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-fi/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-ja/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-ja/strings_sas.xml Auto-merging matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt Auto-merging merge_helpers.sh CONFLICT (add/add): Merge conflict in merge_helpers.sh Auto-merging multipicker/build.gradle CONFLICT (add/add): Merge conflict in multipicker/build.gradle Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt Auto-merging post_merge.sh CONFLICT (add/add): Merge conflict in post_merge.sh Auto-merging pre_merge.sh CONFLICT (add/add): Merge conflict in pre_merge.sh Auto-merging tools/check/forbidden_strings_in_code.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_code.txt Auto-merging tools/check/forbidden_strings_in_resources.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_resources.txt Auto-merging tools/hs_diag.py CONFLICT (add/add): Merge conflict in tools/hs_diag.py Auto-merging tools/jitsi/build_jisti_libs.sh CONFLICT (add/add): Merge conflict in tools/jitsi/build_jisti_libs.sh Auto-merging tools/release/download_buildkite_artifacts.py CONFLICT (add/add): Merge conflict in tools/release/download_buildkite_artifacts.py Auto-merging tools/release/sign_apk.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk.sh Auto-merging tools/release/sign_apk_unsafe.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk_unsafe.sh Auto-merging tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl Auto-merging tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl Auto-merging tools/templates/configure.sh CONFLICT (add/add): Merge conflict in tools/templates/configure.sh Auto-merging tools/travis/check_pr.sh CONFLICT (add/add): Merge conflict in tools/travis/check_pr.sh Auto-merging upstream_.github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/bug_report.md Auto-merging upstream_.github/ISSUE_TEMPLATE/feature_request.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/feature_request.md Auto-merging upstream_.github/PULL_REQUEST_TEMPLATE.md CONFLICT (add/add): Merge conflict in upstream_.github/PULL_REQUEST_TEMPLATE.md Auto-merging upstream_fastlane/metadata/android/de/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/full_description.txt Auto-merging upstream_fastlane/metadata/android/de/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/short_description.txt Auto-merging upstream_fastlane/metadata/android/de/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/title.txt Auto-merging upstream_fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/full_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/short_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/title.txt Auto-merging upstream_fastlane/metadata/android/es/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/full_description.txt Auto-merging upstream_fastlane/metadata/android/es/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/short_description.txt Auto-merging upstream_fastlane/metadata/android/es/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/title.txt Auto-merging upstream_fastlane/metadata/android/et/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/full_description.txt Auto-merging upstream_fastlane/metadata/android/et/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/short_description.txt Auto-merging upstream_fastlane/metadata/android/et/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/title.txt Auto-merging upstream_fastlane/metadata/android/fa/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fa/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/title.txt Auto-merging upstream_fastlane/metadata/android/fr/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/full_description.txt Auto-merging upstream_fastlane/metadata/android/fr/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/short_description.txt Auto-merging upstream_fastlane/metadata/android/fr/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/title.txt Auto-merging upstream_fastlane/metadata/android/hu/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/hu/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/short_description.txt Auto-merging upstream_fastlane/metadata/android/it/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/title.txt Auto-merging upstream_fastlane/metadata/android/kab/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/kab/short_description.txt Auto-merging upstream_fastlane/metadata/android/sk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sk/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/full_description.txt Auto-merging upstream_fastlane/metadata/android/sv/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/title.txt Auto-merging upstream_fastlane/metadata/android/uk/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/full_description.txt Auto-merging upstream_fastlane/metadata/android/uk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/short_description.txt Auto-merging upstream_fastlane/metadata/android/uk/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/title.txt Auto-merging vector/build.gradle CONFLICT (add/add): Merge conflict in vector/build.gradle Auto-merging vector/lint.xml CONFLICT (add/add): Merge conflict in vector/lint.xml Auto-merging vector/src/androidTest/java/im/vector/app/RegistrationTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/RegistrationTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt Auto-merging vector/src/debug/res/layout/activity_debug_menu.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_debug_menu.xml Auto-merging vector/src/debug/res/layout/activity_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_linkify.xml Auto-merging vector/src/debug/res/layout/activity_test_material_theme.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_material_theme.xml Auto-merging vector/src/debug/res/layout/demo_themes.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/demo_themes.xml Auto-merging vector/src/debug/res/layout/item_sas_emoji.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_sas_emoji.xml Auto-merging vector/src/debug/res/layout/item_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_test_linkify.xml Auto-merging vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt Auto-merging vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt Auto-merging vector/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in vector/src/main/AndroidManifest.xml Auto-merging vector/src/main/assets/open_source_licenses.html CONFLICT (add/add): Merge conflict in vector/src/main/assets/open_source_licenses.html Auto-merging vector/src/main/java/im/vector/app/AppStateHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/AppStateHandler.kt Auto-merging vector/src/main/java/im/vector/app/VectorApplication.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/VectorApplication.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt Auto-merging vector/src/main/java/im/vector/app/core/di/FragmentModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/FragmentModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Activity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Activity.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/EditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/EditText.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Fragment.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/LiveData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/LiveData.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Session.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Session.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Set.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Set.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TextView.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt Auto-merging vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/StateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/StateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt Auto-merging vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallService.kt Auto-merging vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DataSource.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Debouncer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Debouncer.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Emoji.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Emoji.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FileUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FileUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Handler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Handler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/TextUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/TextUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/MainActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/MainActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsView.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt Auto-merging vector/src/main/java/im/vector/app/features/command/Command.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/Command.kt Auto-merging vector/src/main/java/im/vector/app/features/command/CommandParser.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/CommandParser.kt Auto-merging vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt Auto-merging vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt Auto-merging vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginAction.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginConfig.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginConfig.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginMode.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt Auto-merging vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/Navigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/Navigator.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinLocker.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinLocker.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinMode.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt Auto-merging vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/session/SessionListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/session/SessionListener.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/share/SharedData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/SharedData.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt Auto-merging vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/TermsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/TermsController.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt Auto-merging vector/src/main/res/drawable/bg_group_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/bg_group_item.xml Auto-merging vector/src/main/res/drawable/ic_arrow_right.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_arrow_right.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_catchup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_catchup.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_group.xml Auto-merging vector/src/main/res/drawable/ic_noun_party_popper.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_noun_party_popper.xml Auto-merging vector/src/main/res/drawable/ic_trash_24.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_trash_24.xml Auto-merging vector/src/main/res/layout/activity.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity.xml Auto-merging vector/src/main/res/layout/activity_bug_report.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_bug_report.xml Auto-merging vector/src/main/res/layout/activity_call.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_call.xml Auto-merging vector/src/main/res/layout/activity_emoji_reaction_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_emoji_reaction_picker.xml Auto-merging vector/src/main/res/layout/activity_filtered_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_filtered_rooms.xml Auto-merging vector/src/main/res/layout/activity_home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_home.xml Auto-merging vector/src/main/res/layout/activity_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_incoming_share.xml Auto-merging vector/src/main/res/layout/activity_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_login.xml Auto-merging vector/src/main/res/layout/activity_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_room_detail.xml Auto-merging vector/src/main/res/layout/activity_search.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_search.xml Auto-merging vector/src/main/res/layout/activity_simple.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_simple.xml Auto-merging vector/src/main/res/layout/activity_vector_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_vector_settings.xml Auto-merging vector/src/main/res/layout/activity_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_widget.xml Auto-merging vector/src/main/res/layout/alerter_verification_layout.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/alerter_verification_layout.xml Auto-merging vector/src/main/res/layout/bottom_sheet_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_call_controls.xml Auto-merging vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml Auto-merging vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml Auto-merging vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml Auto-merging vector/src/main/res/layout/bottom_sheet_verification.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_verification.xml Auto-merging vector/src/main/res/layout/custom_action_item_layout_badge.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/custom_action_item_layout_badge.xml Auto-merging vector/src/main/res/layout/dialog_base_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_base_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_change_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_change_password.xml Auto-merging vector/src/main/res/layout/dialog_disclaimer_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_disclaimer_content.xml Auto-merging vector/src/main/res/layout/dialog_event_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_event_content.xml Auto-merging vector/src/main/res/layout/dialog_export_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_export_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_import_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_import_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_preference_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_preference_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_prompt_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_prompt_password.xml Auto-merging vector/src/main/res/layout/fragment_attachments_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_attachments_preview.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml Auto-merging vector/src/main/res/layout/fragment_contacts_book.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_contacts_book.xml Auto-merging vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml Auto-merging vector/src/main/res/layout/fragment_create_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_room.xml Auto-merging vector/src/main/res/layout/fragment_deactivate_account.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_deactivate_account.xml Auto-merging vector/src/main/res/layout/fragment_generic_recycler.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_generic_recycler.xml Auto-merging vector/src/main/res/layout/fragment_home_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_detail.xml Auto-merging vector/src/main/res/layout/fragment_home_drawer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_drawer.xml Auto-merging vector/src/main/res/layout/fragment_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_incoming_share.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_success.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_success.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml Auto-merging vector/src/main/res/layout/fragment_loading.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_loading.xml Auto-merging vector/src/main/res/layout/fragment_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login.xml Auto-merging vector/src/main/res/layout/fragment_login_reset_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_reset_password.xml Auto-merging vector/src/main/res/layout/fragment_login_server_url_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_server_url_form.xml Auto-merging vector/src/main/res/layout/fragment_login_signup_signin_selection.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_signup_signin_selection.xml Auto-merging vector/src/main/res/layout/fragment_login_splash.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_splash.xml Auto-merging vector/src/main/res/layout/fragment_login_terms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_terms.xml Auto-merging vector/src/main/res/layout/fragment_matrix_profile.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_matrix_profile.xml Auto-merging vector/src/main/res/layout/fragment_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_pin.xml Auto-merging vector/src/main/res/layout/fragment_public_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_public_rooms.xml Auto-merging vector/src/main/res/layout/fragment_qr_code_scanner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_qr_code_scanner.xml Auto-merging vector/src/main/res/layout/fragment_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_detail.xml Auto-merging vector/src/main/res/layout/fragment_room_directory_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_directory_picker.xml Auto-merging vector/src/main/res/layout/fragment_room_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_list.xml Auto-merging vector/src/main/res/layout/fragment_room_member_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_member_list.xml Auto-merging vector/src/main/res/layout/fragment_room_preview_no_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_preview_no_preview.xml Auto-merging vector/src/main/res/layout/fragment_room_setting_generic.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_setting_generic.xml Auto-merging vector/src/main/res/layout/fragment_room_uploads.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_uploads.xml Auto-merging vector/src/main/res/layout/fragment_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_widget.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_key.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_user_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_user_directory.xml Auto-merging vector/src/main/res/layout/item_attachment_big_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_big_preview.xml Auto-merging vector/src/main/res/layout/item_attachment_miniature_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_miniature_preview.xml Auto-merging vector/src/main/res/layout/item_autocomplete_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_autocomplete_matrix_item.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_action.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_message_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_message_preview.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_room_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_room_preview.xml Auto-merging vector/src/main/res/layout/item_breadcrumbs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_breadcrumbs.xml Auto-merging vector/src/main/res/layout/item_contact_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_detail.xml Auto-merging vector/src/main/res/layout/item_contact_main.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_main.xml Auto-merging vector/src/main/res/layout/item_create_direct_room_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_create_direct_room_user.xml Auto-merging vector/src/main/res/layout/item_device.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_device.xml Auto-merging vector/src/main/res/layout/item_display_read_receipt.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_display_read_receipt.xml Auto-merging vector/src/main/res/layout/item_editable_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_editable_avatar.xml Auto-merging vector/src/main/res/layout/item_emoji_verif.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_emoji_verif.xml Auto-merging vector/src/main/res/layout/item_expandable_textview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_expandable_textview.xml Auto-merging vector/src/main/res/layout/item_form_switch.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_switch.xml Auto-merging vector/src/main/res/layout/item_form_text_input.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_text_input.xml Auto-merging vector/src/main/res/layout/item_generic_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_list.xml Auto-merging vector/src/main/res/layout/item_generic_with_value.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_with_value.xml Auto-merging vector/src/main/res/layout/item_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_group.xml Auto-merging vector/src/main/res/layout/item_help_footer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_help_footer.xml Auto-merging vector/src/main/res/layout/item_known_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_known_user.xml Auto-merging vector/src/main/res/layout/item_login_password_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_login_password_form.xml Auto-merging vector/src/main/res/layout/item_notification_troubleshoot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_notification_troubleshoot.xml Auto-merging vector/src/main/res/layout/item_profile_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_action.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item_progress.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item_progress.xml Auto-merging vector/src/main/res/layout/item_public_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_public_room.xml Auto-merging vector/src/main/res/layout/item_pushrule_raw.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_pushrule_raw.xml Auto-merging vector/src/main/res/layout/item_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room.xml Auto-merging vector/src/main/res/layout/item_room_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_directory.xml Auto-merging vector/src/main/res/layout/item_room_invitation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_invitation.xml Auto-merging vector/src/main/res/layout/item_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_widget.xml Auto-merging vector/src/main/res/layout/item_search_result.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_search_result.xml Auto-merging vector/src/main/res/layout/item_settings_three_pid.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_settings_three_pid.xml Auto-merging vector/src/main/res/layout/item_simple_reaction_info.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_simple_reaction_info.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_noinfo.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_noinfo.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_state.xml Auto-merging vector/src/main/res/layout/item_timeline_event_day_separator.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_day_separator.xml Auto-merging vector/src/main/res/layout/item_timeline_event_default_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_default_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_file_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_file_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_media_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_media_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_notice_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_notice_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_poll_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_poll_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_text_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_text_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_read_marker.xml Auto-merging vector/src/main/res/layout/item_tos.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_tos.xml Auto-merging vector/src/main/res/layout/item_unknown_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_unknown_room.xml Auto-merging vector/src/main/res/layout/item_uploads_file.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_file.xml Auto-merging vector/src/main/res/layout/item_uploads_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_image.xml Auto-merging vector/src/main/res/layout/item_uploads_video.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_video.xml Auto-merging vector/src/main/res/layout/item_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_user.xml Auto-merging vector/src/main/res/layout/item_verification_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_action.xml Auto-merging vector/src/main/res/layout/item_verification_big_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_big_image.xml Auto-merging vector/src/main/res/layout/item_verification_qr_code.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_qr_code.xml Auto-merging vector/src/main/res/layout/item_verification_wait.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_wait.xml Auto-merging vector/src/main/res/layout/merge_overlay_waiting_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/merge_overlay_waiting_view.xml Auto-merging vector/src/main/res/layout/reaction_button.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/reaction_button.xml Auto-merging vector/src/main/res/layout/vector_invite_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_invite_view.xml Auto-merging vector/src/main/res/layout/vector_message_merge_avatar_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_message_merge_avatar_list.xml Auto-merging vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml Auto-merging vector/src/main/res/layout/vector_settings_round_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_round_avatar.xml Auto-merging vector/src/main/res/layout/view_active_conference_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_active_conference_view.xml Auto-merging vector/src/main/res/layout/view_attachment_type_selector.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_attachment_type_selector.xml Auto-merging vector/src/main/res/layout/view_button_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_button_state.xml Auto-merging vector/src/main/res/layout/view_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_call_controls.xml Auto-merging vector/src/main/res/layout/view_file_icon.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_file_icon.xml Auto-merging vector/src/main/res/layout/view_keys_backup_banner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_keys_backup_banner.xml Auto-merging vector/src/main/res/layout/view_notification_area.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_notification_area.xml Auto-merging vector/src/main/res/layout/view_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_marker.xml Auto-merging vector/src/main/res/layout/view_read_receipts.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_receipts.xml Auto-merging vector/src/main/res/layout/view_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_state.xml Auto-merging vector/src/main/res/layout/view_stub_room_member_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_member_profile_header.xml Auto-merging vector/src/main/res/layout/view_stub_room_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_profile_header.xml Auto-merging vector/src/main/res/menu/home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home.xml Auto-merging vector/src/main/res/menu/home_bottom_navigation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home_bottom_navigation.xml Auto-merging vector/src/main/res/menu/menu_timeline.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/menu_timeline.xml Auto-merging vector/src/main/res/raw/emoji_picker_datasource.json CONFLICT (add/add): Merge conflict in vector/src/main/res/raw/emoji_picker_datasource.json Auto-merging vector/src/main/res/values-ar/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ar/strings.xml Auto-merging vector/src/main/res/values-az/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-az/strings.xml Auto-merging vector/src/main/res/values-b+sr+Latn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-b+sr+Latn/strings.xml Auto-merging vector/src/main/res/values-bg/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bg/strings.xml Auto-merging vector/src/main/res/values-bn-rBD/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rBD/strings.xml Auto-merging vector/src/main/res/values-bn-rIN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rIN/strings.xml Auto-merging vector/src/main/res/values-bs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bs/strings.xml Auto-merging vector/src/main/res/values-ca/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ca/strings.xml Auto-merging vector/src/main/res/values-cs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cs/strings.xml Auto-merging vector/src/main/res/values-cy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cy/strings.xml Auto-merging vector/src/main/res/values-da/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-da/strings.xml Auto-merging vector/src/main/res/values-de/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings.xml Auto-merging vector/src/main/res/values-de/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings_sc.xml Auto-merging vector/src/main/res/values-el/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-el/strings.xml Auto-merging vector/src/main/res/values-eo/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eo/strings.xml Auto-merging vector/src/main/res/values-es-rMX/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es-rMX/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-et/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-et/strings.xml Auto-merging vector/src/main/res/values-eu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eu/strings.xml Auto-merging vector/src/main/res/values-fa/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fa/strings.xml Auto-merging vector/src/main/res/values-fi/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fi/strings.xml Auto-merging vector/src/main/res/values-fr-rCA/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr-rCA/strings.xml Auto-merging vector/src/main/res/values-fr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr/strings.xml Auto-merging vector/src/main/res/values-fy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fy/strings.xml Auto-merging vector/src/main/res/values-gl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-gl/strings.xml Auto-merging vector/src/main/res/values-hr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hr/strings.xml Auto-merging vector/src/main/res/values-hu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hu/strings.xml Auto-merging vector/src/main/res/values-in/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-in/strings.xml Auto-merging vector/src/main/res/values-is/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-is/strings.xml Auto-merging vector/src/main/res/values-it/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-it/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-kab/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-kab/strings.xml Auto-merging vector/src/main/res/values-ko/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ko/strings.xml Auto-merging vector/src/main/res/values-lt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lt/strings.xml Auto-merging vector/src/main/res/values-lv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lv/strings.xml Auto-merging vector/src/main/res/values-nb-rNO/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nb-rNO/strings.xml Auto-merging vector/src/main/res/values-nl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nl/strings.xml Auto-merging vector/src/main/res/values-nn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nn/strings.xml Auto-merging vector/src/main/res/values-pl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pl/strings.xml Auto-merging vector/src/main/res/values-pt-rBR/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt-rBR/strings.xml Auto-merging vector/src/main/res/values-pt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt/strings.xml Auto-merging vector/src/main/res/values-ro/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ro/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-ru/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings_sc.xml Auto-merging vector/src/main/res/values-sk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sk/strings.xml Auto-merging vector/src/main/res/values-sq/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sq/strings.xml Auto-merging vector/src/main/res/values-sr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sr/strings.xml Auto-merging vector/src/main/res/values-sv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sv/strings.xml Auto-merging vector/src/main/res/values-te/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-te/strings.xml Auto-merging vector/src/main/res/values-th/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-th/strings.xml Auto-merging vector/src/main/res/values-tlh/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tlh/strings.xml Auto-merging vector/src/main/res/values-tr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tr/strings.xml Auto-merging vector/src/main/res/values-tzm/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tzm/strings.xml Auto-merging vector/src/main/res/values-uk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-vls/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-vls/strings.xml Auto-merging vector/src/main/res/values-w820dp/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-w820dp/dimens_sc.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-zh-rTW/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values/array.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/array.xml Auto-merging vector/src/main/res/values/attrs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs.xml Auto-merging vector/src/main/res/values/attrs_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs_sc.xml Auto-merging vector/src/main/res/values/colors_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/colors_sc.xml Auto-merging vector/src/main/res/values/config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/config.xml Auto-merging vector/src/main/res/values/dimens.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens.xml Auto-merging vector/src/main/res/values/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens_sc.xml Auto-merging vector/src/main/res/values/donottranslate.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/donottranslate.xml Auto-merging vector/src/main/res/values/font_certs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/font_certs.xml Auto-merging vector/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings.xml Auto-merging vector/src/main/res/values/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings_sc.xml Auto-merging vector/src/main/res/values/style_snackbar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/style_snackbar.xml Auto-merging vector/src/main/res/values/styles.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles.xml Auto-merging vector/src/main/res/values/styles_riot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_riot.xml Auto-merging vector/src/main/res/values/styles_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_sc.xml Auto-merging vector/src/main/res/values/theme_black.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_black.xml Auto-merging vector/src/main/res/values/theme_dark.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_dark.xml Auto-merging vector/src/main/res/values/theme_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_light.xml Auto-merging vector/src/main/res/values/theme_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc.xml Auto-merging vector/src/main/res/values/theme_sc_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc_light.xml Auto-merging vector/src/main/res/xml/network_security_config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/network_security_config.xml Auto-merging vector/src/main/res/xml/vector_settings_advanced_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_advanced_settings.xml Auto-merging vector/src/main/res/xml/vector_settings_general.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_general.xml Auto-merging vector/src/main/res/xml/vector_settings_labs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_labs.xml Auto-merging vector/src/main/res/xml/vector_settings_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_pin.xml Auto-merging vector/src/main/res/xml/vector_settings_preferences.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_preferences.xml Auto-merging vector/src/main/res/xml/vector_settings_security_privacy.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_security_privacy.xml error: could not apply dd8ebfbb36... Automatic SchildiChat string correction hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply dd8ebfbb36... Automatic SchildiChat string correction (1) 17 hours ago
None Received repository notification SchildiChat / SchildiChat-android	GitHub: https://github.com/SchildiChat/SchildiChat-android, sc 17 hours ago
None Failed rebase on repository SchildiChat / SchildiChat-android	Rebasing (1/11093) Auto-merging .github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .idea/codeStyles/Project.xml CONFLICT (add/add): Merge conflict in .idea/codeStyles/Project.xml Auto-merging .idea/dictionaries/bmarty.xml CONFLICT (add/add): Merge conflict in .idea/dictionaries/bmarty.xml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging AUTHORS.md CONFLICT (add/add): Merge conflict in AUTHORS.md Auto-merging CHANGES.md CONFLICT (add/add): Merge conflict in CHANGES.md Auto-merging CONTRIBUTING.md CONFLICT (add/add): Merge conflict in CONTRIBUTING.md Auto-merging PRIVACY.md CONFLICT (add/add): Merge conflict in PRIVACY.md Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging alternative_package.sh CONFLICT (add/add): Merge conflict in alternative_package.sh Auto-merging attachment-viewer/build.gradle CONFLICT (add/add): Merge conflict in attachment-viewer/build.gradle Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt Auto-merging build.gradle CONFLICT (add/add): Merge conflict in build.gradle Auto-merging correct_strings.sh CONFLICT (add/add): Merge conflict in correct_strings.sh Auto-merging docs/jitsi.md CONFLICT (add/add): Merge conflict in docs/jitsi.md Auto-merging docs/notifications.md CONFLICT (add/add): Merge conflict in docs/notifications.md Auto-merging docs/signin.md CONFLICT (add/add): Merge conflict in docs/signin.md Auto-merging docs/ui-tests.md CONFLICT (add/add): Merge conflict in docs/ui-tests.md Auto-merging fastlane/metadata/android/de-DE/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/de-DE/full_description.txt Auto-merging fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/en-US/full_description.txt Auto-merging fastlane/metadata/android/ru-RU/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/ru-RU/full_description.txt Auto-merging gradle.properties CONFLICT (add/add): Merge conflict in gradle.properties Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging graphics/materialdesignicons/README.md CONFLICT (add/add): Merge conflict in graphics/materialdesignicons/README.md Auto-merging increment_version.sh CONFLICT (add/add): Merge conflict in increment_version.sh Auto-merging matrix-sdk-android-rx/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/build.gradle Auto-merging matrix-sdk-android-rx/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/AndroidManifest.xml Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt Auto-merging matrix-sdk-android/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android/build.gradle Auto-merging matrix-sdk-android/proguard-rules.pro CONFLICT (add/add): Merge conflict in matrix-sdk-android/proguard-rules.pro Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt Auto-merging matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt Auto-merging matrix-sdk-android/src/main/res/values-de/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-de/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-es/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-es/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-fi/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-fi/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-ja/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-ja/strings_sas.xml Auto-merging matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt Auto-merging merge_helpers.sh CONFLICT (add/add): Merge conflict in merge_helpers.sh Auto-merging multipicker/build.gradle CONFLICT (add/add): Merge conflict in multipicker/build.gradle Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt Auto-merging post_merge.sh CONFLICT (add/add): Merge conflict in post_merge.sh Auto-merging pre_merge.sh CONFLICT (add/add): Merge conflict in pre_merge.sh Auto-merging tools/check/forbidden_strings_in_code.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_code.txt Auto-merging tools/check/forbidden_strings_in_resources.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_resources.txt Auto-merging tools/hs_diag.py CONFLICT (add/add): Merge conflict in tools/hs_diag.py Auto-merging tools/jitsi/build_jisti_libs.sh CONFLICT (add/add): Merge conflict in tools/jitsi/build_jisti_libs.sh Auto-merging tools/release/download_buildkite_artifacts.py CONFLICT (add/add): Merge conflict in tools/release/download_buildkite_artifacts.py Auto-merging tools/release/sign_apk.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk.sh Auto-merging tools/release/sign_apk_unsafe.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk_unsafe.sh Auto-merging tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl Auto-merging tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl Auto-merging tools/templates/configure.sh CONFLICT (add/add): Merge conflict in tools/templates/configure.sh Auto-merging tools/travis/check_pr.sh CONFLICT (add/add): Merge conflict in tools/travis/check_pr.sh Auto-merging upstream_.github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/bug_report.md Auto-merging upstream_.github/ISSUE_TEMPLATE/feature_request.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/feature_request.md Auto-merging upstream_.github/PULL_REQUEST_TEMPLATE.md CONFLICT (add/add): Merge conflict in upstream_.github/PULL_REQUEST_TEMPLATE.md Auto-merging upstream_fastlane/metadata/android/de/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/full_description.txt Auto-merging upstream_fastlane/metadata/android/de/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/short_description.txt Auto-merging upstream_fastlane/metadata/android/de/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/title.txt Auto-merging upstream_fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/full_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/short_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/title.txt Auto-merging upstream_fastlane/metadata/android/es/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/full_description.txt Auto-merging upstream_fastlane/metadata/android/es/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/short_description.txt Auto-merging upstream_fastlane/metadata/android/es/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/title.txt Auto-merging upstream_fastlane/metadata/android/et/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/full_description.txt Auto-merging upstream_fastlane/metadata/android/et/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/short_description.txt Auto-merging upstream_fastlane/metadata/android/et/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/title.txt Auto-merging upstream_fastlane/metadata/android/fa/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fa/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/title.txt Auto-merging upstream_fastlane/metadata/android/fr/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/full_description.txt Auto-merging upstream_fastlane/metadata/android/fr/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/short_description.txt Auto-merging upstream_fastlane/metadata/android/fr/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/title.txt Auto-merging upstream_fastlane/metadata/android/hu/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/hu/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/short_description.txt Auto-merging upstream_fastlane/metadata/android/it/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/title.txt Auto-merging upstream_fastlane/metadata/android/kab/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/kab/short_description.txt Auto-merging upstream_fastlane/metadata/android/sk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sk/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/full_description.txt Auto-merging upstream_fastlane/metadata/android/sv/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/title.txt Auto-merging upstream_fastlane/metadata/android/uk/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/full_description.txt Auto-merging upstream_fastlane/metadata/android/uk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/short_description.txt Auto-merging upstream_fastlane/metadata/android/uk/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/title.txt Auto-merging vector/build.gradle CONFLICT (add/add): Merge conflict in vector/build.gradle Auto-merging vector/lint.xml CONFLICT (add/add): Merge conflict in vector/lint.xml Auto-merging vector/src/androidTest/java/im/vector/app/RegistrationTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/RegistrationTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt Auto-merging vector/src/debug/res/layout/activity_debug_menu.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_debug_menu.xml Auto-merging vector/src/debug/res/layout/activity_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_linkify.xml Auto-merging vector/src/debug/res/layout/activity_test_material_theme.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_material_theme.xml Auto-merging vector/src/debug/res/layout/demo_themes.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/demo_themes.xml Auto-merging vector/src/debug/res/layout/item_sas_emoji.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_sas_emoji.xml Auto-merging vector/src/debug/res/layout/item_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_test_linkify.xml Auto-merging vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt Auto-merging vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt Auto-merging vector/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in vector/src/main/AndroidManifest.xml Auto-merging vector/src/main/assets/open_source_licenses.html CONFLICT (add/add): Merge conflict in vector/src/main/assets/open_source_licenses.html Auto-merging vector/src/main/java/im/vector/app/AppStateHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/AppStateHandler.kt Auto-merging vector/src/main/java/im/vector/app/VectorApplication.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/VectorApplication.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt Auto-merging vector/src/main/java/im/vector/app/core/di/FragmentModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/FragmentModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Activity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Activity.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/EditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/EditText.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Fragment.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/LiveData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/LiveData.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Session.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Session.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Set.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Set.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TextView.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt Auto-merging vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/StateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/StateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt Auto-merging vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallService.kt Auto-merging vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DataSource.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Debouncer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Debouncer.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Emoji.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Emoji.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FileUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FileUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Handler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Handler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/TextUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/TextUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/MainActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/MainActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsView.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt Auto-merging vector/src/main/java/im/vector/app/features/command/Command.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/Command.kt Auto-merging vector/src/main/java/im/vector/app/features/command/CommandParser.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/CommandParser.kt Auto-merging vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt Auto-merging vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt Auto-merging vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginAction.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginConfig.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginConfig.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginMode.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt Auto-merging vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/Navigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/Navigator.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinLocker.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinLocker.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinMode.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt Auto-merging vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/session/SessionListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/session/SessionListener.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/share/SharedData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/SharedData.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt Auto-merging vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/TermsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/TermsController.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt Auto-merging vector/src/main/res/drawable/bg_group_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/bg_group_item.xml Auto-merging vector/src/main/res/drawable/ic_arrow_right.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_arrow_right.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_catchup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_catchup.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_group.xml Auto-merging vector/src/main/res/drawable/ic_noun_party_popper.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_noun_party_popper.xml Auto-merging vector/src/main/res/drawable/ic_trash_24.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_trash_24.xml Auto-merging vector/src/main/res/layout/activity.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity.xml Auto-merging vector/src/main/res/layout/activity_bug_report.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_bug_report.xml Auto-merging vector/src/main/res/layout/activity_call.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_call.xml Auto-merging vector/src/main/res/layout/activity_emoji_reaction_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_emoji_reaction_picker.xml Auto-merging vector/src/main/res/layout/activity_filtered_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_filtered_rooms.xml Auto-merging vector/src/main/res/layout/activity_home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_home.xml Auto-merging vector/src/main/res/layout/activity_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_incoming_share.xml Auto-merging vector/src/main/res/layout/activity_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_login.xml Auto-merging vector/src/main/res/layout/activity_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_room_detail.xml Auto-merging vector/src/main/res/layout/activity_search.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_search.xml Auto-merging vector/src/main/res/layout/activity_simple.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_simple.xml Auto-merging vector/src/main/res/layout/activity_vector_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_vector_settings.xml Auto-merging vector/src/main/res/layout/activity_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_widget.xml Auto-merging vector/src/main/res/layout/alerter_verification_layout.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/alerter_verification_layout.xml Auto-merging vector/src/main/res/layout/bottom_sheet_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_call_controls.xml Auto-merging vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml Auto-merging vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml Auto-merging vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml Auto-merging vector/src/main/res/layout/bottom_sheet_verification.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_verification.xml Auto-merging vector/src/main/res/layout/custom_action_item_layout_badge.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/custom_action_item_layout_badge.xml Auto-merging vector/src/main/res/layout/dialog_base_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_base_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_change_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_change_password.xml Auto-merging vector/src/main/res/layout/dialog_disclaimer_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_disclaimer_content.xml Auto-merging vector/src/main/res/layout/dialog_event_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_event_content.xml Auto-merging vector/src/main/res/layout/dialog_export_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_export_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_import_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_import_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_preference_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_preference_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_prompt_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_prompt_password.xml Auto-merging vector/src/main/res/layout/fragment_attachments_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_attachments_preview.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml Auto-merging vector/src/main/res/layout/fragment_contacts_book.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_contacts_book.xml Auto-merging vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml Auto-merging vector/src/main/res/layout/fragment_create_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_room.xml Auto-merging vector/src/main/res/layout/fragment_deactivate_account.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_deactivate_account.xml Auto-merging vector/src/main/res/layout/fragment_generic_recycler.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_generic_recycler.xml Auto-merging vector/src/main/res/layout/fragment_home_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_detail.xml Auto-merging vector/src/main/res/layout/fragment_home_drawer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_drawer.xml Auto-merging vector/src/main/res/layout/fragment_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_incoming_share.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_success.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_success.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml Auto-merging vector/src/main/res/layout/fragment_loading.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_loading.xml Auto-merging vector/src/main/res/layout/fragment_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login.xml Auto-merging vector/src/main/res/layout/fragment_login_reset_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_reset_password.xml Auto-merging vector/src/main/res/layout/fragment_login_server_url_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_server_url_form.xml Auto-merging vector/src/main/res/layout/fragment_login_signup_signin_selection.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_signup_signin_selection.xml Auto-merging vector/src/main/res/layout/fragment_login_splash.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_splash.xml Auto-merging vector/src/main/res/layout/fragment_login_terms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_terms.xml Auto-merging vector/src/main/res/layout/fragment_matrix_profile.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_matrix_profile.xml Auto-merging vector/src/main/res/layout/fragment_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_pin.xml Auto-merging vector/src/main/res/layout/fragment_public_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_public_rooms.xml Auto-merging vector/src/main/res/layout/fragment_qr_code_scanner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_qr_code_scanner.xml Auto-merging vector/src/main/res/layout/fragment_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_detail.xml Auto-merging vector/src/main/res/layout/fragment_room_directory_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_directory_picker.xml Auto-merging vector/src/main/res/layout/fragment_room_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_list.xml Auto-merging vector/src/main/res/layout/fragment_room_member_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_member_list.xml Auto-merging vector/src/main/res/layout/fragment_room_preview_no_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_preview_no_preview.xml Auto-merging vector/src/main/res/layout/fragment_room_setting_generic.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_setting_generic.xml Auto-merging vector/src/main/res/layout/fragment_room_uploads.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_uploads.xml Auto-merging vector/src/main/res/layout/fragment_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_widget.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_key.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_user_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_user_directory.xml Auto-merging vector/src/main/res/layout/item_attachment_big_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_big_preview.xml Auto-merging vector/src/main/res/layout/item_attachment_miniature_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_miniature_preview.xml Auto-merging vector/src/main/res/layout/item_autocomplete_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_autocomplete_matrix_item.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_action.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_message_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_message_preview.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_room_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_room_preview.xml Auto-merging vector/src/main/res/layout/item_breadcrumbs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_breadcrumbs.xml Auto-merging vector/src/main/res/layout/item_contact_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_detail.xml Auto-merging vector/src/main/res/layout/item_contact_main.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_main.xml Auto-merging vector/src/main/res/layout/item_create_direct_room_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_create_direct_room_user.xml Auto-merging vector/src/main/res/layout/item_device.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_device.xml Auto-merging vector/src/main/res/layout/item_display_read_receipt.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_display_read_receipt.xml Auto-merging vector/src/main/res/layout/item_editable_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_editable_avatar.xml Auto-merging vector/src/main/res/layout/item_emoji_verif.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_emoji_verif.xml Auto-merging vector/src/main/res/layout/item_expandable_textview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_expandable_textview.xml Auto-merging vector/src/main/res/layout/item_form_switch.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_switch.xml Auto-merging vector/src/main/res/layout/item_form_text_input.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_text_input.xml Auto-merging vector/src/main/res/layout/item_generic_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_list.xml Auto-merging vector/src/main/res/layout/item_generic_with_value.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_with_value.xml Auto-merging vector/src/main/res/layout/item_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_group.xml Auto-merging vector/src/main/res/layout/item_help_footer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_help_footer.xml Auto-merging vector/src/main/res/layout/item_known_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_known_user.xml Auto-merging vector/src/main/res/layout/item_login_password_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_login_password_form.xml Auto-merging vector/src/main/res/layout/item_notification_troubleshoot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_notification_troubleshoot.xml Auto-merging vector/src/main/res/layout/item_profile_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_action.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item_progress.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item_progress.xml Auto-merging vector/src/main/res/layout/item_public_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_public_room.xml Auto-merging vector/src/main/res/layout/item_pushrule_raw.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_pushrule_raw.xml Auto-merging vector/src/main/res/layout/item_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room.xml Auto-merging vector/src/main/res/layout/item_room_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_directory.xml Auto-merging vector/src/main/res/layout/item_room_invitation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_invitation.xml Auto-merging vector/src/main/res/layout/item_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_widget.xml Auto-merging vector/src/main/res/layout/item_search_result.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_search_result.xml Auto-merging vector/src/main/res/layout/item_settings_three_pid.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_settings_three_pid.xml Auto-merging vector/src/main/res/layout/item_simple_reaction_info.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_simple_reaction_info.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_noinfo.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_noinfo.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_state.xml Auto-merging vector/src/main/res/layout/item_timeline_event_day_separator.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_day_separator.xml Auto-merging vector/src/main/res/layout/item_timeline_event_default_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_default_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_file_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_file_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_media_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_media_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_notice_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_notice_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_poll_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_poll_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_text_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_text_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_read_marker.xml Auto-merging vector/src/main/res/layout/item_tos.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_tos.xml Auto-merging vector/src/main/res/layout/item_unknown_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_unknown_room.xml Auto-merging vector/src/main/res/layout/item_uploads_file.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_file.xml Auto-merging vector/src/main/res/layout/item_uploads_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_image.xml Auto-merging vector/src/main/res/layout/item_uploads_video.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_video.xml Auto-merging vector/src/main/res/layout/item_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_user.xml Auto-merging vector/src/main/res/layout/item_verification_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_action.xml Auto-merging vector/src/main/res/layout/item_verification_big_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_big_image.xml Auto-merging vector/src/main/res/layout/item_verification_qr_code.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_qr_code.xml Auto-merging vector/src/main/res/layout/item_verification_wait.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_wait.xml Auto-merging vector/src/main/res/layout/merge_overlay_waiting_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/merge_overlay_waiting_view.xml Auto-merging vector/src/main/res/layout/reaction_button.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/reaction_button.xml Auto-merging vector/src/main/res/layout/vector_invite_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_invite_view.xml Auto-merging vector/src/main/res/layout/vector_message_merge_avatar_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_message_merge_avatar_list.xml Auto-merging vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml Auto-merging vector/src/main/res/layout/vector_settings_round_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_round_avatar.xml Auto-merging vector/src/main/res/layout/view_active_conference_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_active_conference_view.xml Auto-merging vector/src/main/res/layout/view_attachment_type_selector.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_attachment_type_selector.xml Auto-merging vector/src/main/res/layout/view_button_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_button_state.xml Auto-merging vector/src/main/res/layout/view_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_call_controls.xml Auto-merging vector/src/main/res/layout/view_file_icon.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_file_icon.xml Auto-merging vector/src/main/res/layout/view_keys_backup_banner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_keys_backup_banner.xml Auto-merging vector/src/main/res/layout/view_notification_area.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_notification_area.xml Auto-merging vector/src/main/res/layout/view_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_marker.xml Auto-merging vector/src/main/res/layout/view_read_receipts.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_receipts.xml Auto-merging vector/src/main/res/layout/view_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_state.xml Auto-merging vector/src/main/res/layout/view_stub_room_member_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_member_profile_header.xml Auto-merging vector/src/main/res/layout/view_stub_room_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_profile_header.xml Auto-merging vector/src/main/res/menu/home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home.xml Auto-merging vector/src/main/res/menu/home_bottom_navigation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home_bottom_navigation.xml Auto-merging vector/src/main/res/menu/menu_timeline.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/menu_timeline.xml Auto-merging vector/src/main/res/raw/emoji_picker_datasource.json CONFLICT (add/add): Merge conflict in vector/src/main/res/raw/emoji_picker_datasource.json Auto-merging vector/src/main/res/values-ar/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ar/strings.xml Auto-merging vector/src/main/res/values-az/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-az/strings.xml Auto-merging vector/src/main/res/values-b+sr+Latn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-b+sr+Latn/strings.xml Auto-merging vector/src/main/res/values-bg/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bg/strings.xml Auto-merging vector/src/main/res/values-bn-rBD/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rBD/strings.xml Auto-merging vector/src/main/res/values-bn-rIN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rIN/strings.xml Auto-merging vector/src/main/res/values-bs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bs/strings.xml Auto-merging vector/src/main/res/values-ca/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ca/strings.xml Auto-merging vector/src/main/res/values-cs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cs/strings.xml Auto-merging vector/src/main/res/values-cy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cy/strings.xml Auto-merging vector/src/main/res/values-da/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-da/strings.xml Auto-merging vector/src/main/res/values-de/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings.xml Auto-merging vector/src/main/res/values-de/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings_sc.xml Auto-merging vector/src/main/res/values-el/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-el/strings.xml Auto-merging vector/src/main/res/values-eo/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eo/strings.xml Auto-merging vector/src/main/res/values-es-rMX/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es-rMX/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-et/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-et/strings.xml Auto-merging vector/src/main/res/values-eu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eu/strings.xml Auto-merging vector/src/main/res/values-fa/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fa/strings.xml Auto-merging vector/src/main/res/values-fi/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fi/strings.xml Auto-merging vector/src/main/res/values-fr-rCA/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr-rCA/strings.xml Auto-merging vector/src/main/res/values-fr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr/strings.xml Auto-merging vector/src/main/res/values-fy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fy/strings.xml Auto-merging vector/src/main/res/values-gl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-gl/strings.xml Auto-merging vector/src/main/res/values-hr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hr/strings.xml Auto-merging vector/src/main/res/values-hu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hu/strings.xml Auto-merging vector/src/main/res/values-in/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-in/strings.xml Auto-merging vector/src/main/res/values-is/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-is/strings.xml Auto-merging vector/src/main/res/values-it/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-it/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-kab/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-kab/strings.xml Auto-merging vector/src/main/res/values-ko/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ko/strings.xml Auto-merging vector/src/main/res/values-lt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lt/strings.xml Auto-merging vector/src/main/res/values-lv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lv/strings.xml Auto-merging vector/src/main/res/values-nb-rNO/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nb-rNO/strings.xml Auto-merging vector/src/main/res/values-nl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nl/strings.xml Auto-merging vector/src/main/res/values-nn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nn/strings.xml Auto-merging vector/src/main/res/values-pl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pl/strings.xml Auto-merging vector/src/main/res/values-pt-rBR/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt-rBR/strings.xml Auto-merging vector/src/main/res/values-pt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt/strings.xml Auto-merging vector/src/main/res/values-ro/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ro/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-ru/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings_sc.xml Auto-merging vector/src/main/res/values-sk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sk/strings.xml Auto-merging vector/src/main/res/values-sq/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sq/strings.xml Auto-merging vector/src/main/res/values-sr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sr/strings.xml Auto-merging vector/src/main/res/values-sv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sv/strings.xml Auto-merging vector/src/main/res/values-te/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-te/strings.xml Auto-merging vector/src/main/res/values-th/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-th/strings.xml Auto-merging vector/src/main/res/values-tlh/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tlh/strings.xml Auto-merging vector/src/main/res/values-tr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tr/strings.xml Auto-merging vector/src/main/res/values-tzm/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tzm/strings.xml Auto-merging vector/src/main/res/values-uk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-vls/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-vls/strings.xml Auto-merging vector/src/main/res/values-w820dp/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-w820dp/dimens_sc.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-zh-rTW/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values/array.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/array.xml Auto-merging vector/src/main/res/values/attrs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs.xml Auto-merging vector/src/main/res/values/attrs_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs_sc.xml Auto-merging vector/src/main/res/values/colors_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/colors_sc.xml Auto-merging vector/src/main/res/values/config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/config.xml Auto-merging vector/src/main/res/values/dimens.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens.xml Auto-merging vector/src/main/res/values/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens_sc.xml Auto-merging vector/src/main/res/values/donottranslate.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/donottranslate.xml Auto-merging vector/src/main/res/values/font_certs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/font_certs.xml Auto-merging vector/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings.xml Auto-merging vector/src/main/res/values/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings_sc.xml Auto-merging vector/src/main/res/values/style_snackbar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/style_snackbar.xml Auto-merging vector/src/main/res/values/styles.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles.xml Auto-merging vector/src/main/res/values/styles_riot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_riot.xml Auto-merging vector/src/main/res/values/styles_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_sc.xml Auto-merging vector/src/main/res/values/theme_black.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_black.xml Auto-merging vector/src/main/res/values/theme_dark.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_dark.xml Auto-merging vector/src/main/res/values/theme_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_light.xml Auto-merging vector/src/main/res/values/theme_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc.xml Auto-merging vector/src/main/res/values/theme_sc_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc_light.xml Auto-merging vector/src/main/res/xml/network_security_config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/network_security_config.xml Auto-merging vector/src/main/res/xml/vector_settings_advanced_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_advanced_settings.xml Auto-merging vector/src/main/res/xml/vector_settings_general.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_general.xml Auto-merging vector/src/main/res/xml/vector_settings_labs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_labs.xml Auto-merging vector/src/main/res/xml/vector_settings_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_pin.xml Auto-merging vector/src/main/res/xml/vector_settings_preferences.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_preferences.xml Auto-merging vector/src/main/res/xml/vector_settings_security_privacy.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_security_privacy.xml error: could not apply dd8ebfbb36... Automatic SchildiChat string correction hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply dd8ebfbb36... Automatic SchildiChat string correction (1) 17 hours ago
None Received repository notification SchildiChat / SchildiChat-android	GitHub: https://github.com/SchildiChat/SchildiChat-android, sc 17 hours ago
None Failed rebase on repository SchildiChat / SchildiChat-android	Rebasing (1/11093) Auto-merging .github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .idea/codeStyles/Project.xml CONFLICT (add/add): Merge conflict in .idea/codeStyles/Project.xml Auto-merging .idea/dictionaries/bmarty.xml CONFLICT (add/add): Merge conflict in .idea/dictionaries/bmarty.xml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging AUTHORS.md CONFLICT (add/add): Merge conflict in AUTHORS.md Auto-merging CHANGES.md CONFLICT (add/add): Merge conflict in CHANGES.md Auto-merging CONTRIBUTING.md CONFLICT (add/add): Merge conflict in CONTRIBUTING.md Auto-merging PRIVACY.md CONFLICT (add/add): Merge conflict in PRIVACY.md Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging alternative_package.sh CONFLICT (add/add): Merge conflict in alternative_package.sh Auto-merging attachment-viewer/build.gradle CONFLICT (add/add): Merge conflict in attachment-viewer/build.gradle Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt Auto-merging build.gradle CONFLICT (add/add): Merge conflict in build.gradle Auto-merging correct_strings.sh CONFLICT (add/add): Merge conflict in correct_strings.sh Auto-merging docs/jitsi.md CONFLICT (add/add): Merge conflict in docs/jitsi.md Auto-merging docs/notifications.md CONFLICT (add/add): Merge conflict in docs/notifications.md Auto-merging docs/signin.md CONFLICT (add/add): Merge conflict in docs/signin.md Auto-merging docs/ui-tests.md CONFLICT (add/add): Merge conflict in docs/ui-tests.md Auto-merging fastlane/metadata/android/de-DE/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/de-DE/full_description.txt Auto-merging fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/en-US/full_description.txt Auto-merging fastlane/metadata/android/ru-RU/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/ru-RU/full_description.txt Auto-merging gradle.properties CONFLICT (add/add): Merge conflict in gradle.properties Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging graphics/materialdesignicons/README.md CONFLICT (add/add): Merge conflict in graphics/materialdesignicons/README.md Auto-merging increment_version.sh CONFLICT (add/add): Merge conflict in increment_version.sh Auto-merging matrix-sdk-android-rx/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/build.gradle Auto-merging matrix-sdk-android-rx/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/AndroidManifest.xml Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt Auto-merging matrix-sdk-android/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android/build.gradle Auto-merging matrix-sdk-android/proguard-rules.pro CONFLICT (add/add): Merge conflict in matrix-sdk-android/proguard-rules.pro Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt Auto-merging matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt Auto-merging matrix-sdk-android/src/main/res/values-de/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-de/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-es/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-es/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-fi/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-fi/strings_sas.xml Auto-merging matrix-sdk-android/src/main/res/values-ja/strings_sas.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/res/values-ja/strings_sas.xml Auto-merging matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt Auto-merging merge_helpers.sh CONFLICT (add/add): Merge conflict in merge_helpers.sh Auto-merging multipicker/build.gradle CONFLICT (add/add): Merge conflict in multipicker/build.gradle Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt Auto-merging multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt CONFLICT (add/add): Merge conflict in multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt Auto-merging post_merge.sh CONFLICT (add/add): Merge conflict in post_merge.sh Auto-merging pre_merge.sh CONFLICT (add/add): Merge conflict in pre_merge.sh Auto-merging tools/check/forbidden_strings_in_code.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_code.txt Auto-merging tools/check/forbidden_strings_in_resources.txt CONFLICT (add/add): Merge conflict in tools/check/forbidden_strings_in_resources.txt Auto-merging tools/hs_diag.py CONFLICT (add/add): Merge conflict in tools/hs_diag.py Auto-merging tools/jitsi/build_jisti_libs.sh CONFLICT (add/add): Merge conflict in tools/jitsi/build_jisti_libs.sh Auto-merging tools/release/download_buildkite_artifacts.py CONFLICT (add/add): Merge conflict in tools/release/download_buildkite_artifacts.py Auto-merging tools/release/sign_apk.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk.sh Auto-merging tools/release/sign_apk_unsafe.sh CONFLICT (add/add): Merge conflict in tools/release/sign_apk_unsafe.sh Auto-merging tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl Auto-merging tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl CONFLICT (add/add): Merge conflict in tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl Auto-merging tools/templates/configure.sh CONFLICT (add/add): Merge conflict in tools/templates/configure.sh Auto-merging tools/travis/check_pr.sh CONFLICT (add/add): Merge conflict in tools/travis/check_pr.sh Auto-merging upstream_.github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/bug_report.md Auto-merging upstream_.github/ISSUE_TEMPLATE/feature_request.md CONFLICT (add/add): Merge conflict in upstream_.github/ISSUE_TEMPLATE/feature_request.md Auto-merging upstream_.github/PULL_REQUEST_TEMPLATE.md CONFLICT (add/add): Merge conflict in upstream_.github/PULL_REQUEST_TEMPLATE.md Auto-merging upstream_fastlane/metadata/android/de/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/full_description.txt Auto-merging upstream_fastlane/metadata/android/de/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/short_description.txt Auto-merging upstream_fastlane/metadata/android/de/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/de/title.txt Auto-merging upstream_fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/full_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/short_description.txt Auto-merging upstream_fastlane/metadata/android/en-US/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/en-US/title.txt Auto-merging upstream_fastlane/metadata/android/es/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/full_description.txt Auto-merging upstream_fastlane/metadata/android/es/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/short_description.txt Auto-merging upstream_fastlane/metadata/android/es/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/es/title.txt Auto-merging upstream_fastlane/metadata/android/et/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/full_description.txt Auto-merging upstream_fastlane/metadata/android/et/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/short_description.txt Auto-merging upstream_fastlane/metadata/android/et/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/et/title.txt Auto-merging upstream_fastlane/metadata/android/fa/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fa/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/short_description.txt Auto-merging upstream_fastlane/metadata/android/fi/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fi/title.txt Auto-merging upstream_fastlane/metadata/android/fr/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/full_description.txt Auto-merging upstream_fastlane/metadata/android/fr/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/short_description.txt Auto-merging upstream_fastlane/metadata/android/fr/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/fr/title.txt Auto-merging upstream_fastlane/metadata/android/hu/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/hu/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/full_description.txt Auto-merging upstream_fastlane/metadata/android/it/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/short_description.txt Auto-merging upstream_fastlane/metadata/android/it/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/it/title.txt Auto-merging upstream_fastlane/metadata/android/kab/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/kab/short_description.txt Auto-merging upstream_fastlane/metadata/android/sk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sk/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/full_description.txt Auto-merging upstream_fastlane/metadata/android/sv/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/short_description.txt Auto-merging upstream_fastlane/metadata/android/sv/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/sv/title.txt Auto-merging upstream_fastlane/metadata/android/uk/full_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/full_description.txt Auto-merging upstream_fastlane/metadata/android/uk/short_description.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/short_description.txt Auto-merging upstream_fastlane/metadata/android/uk/title.txt CONFLICT (add/add): Merge conflict in upstream_fastlane/metadata/android/uk/title.txt Auto-merging vector/build.gradle CONFLICT (add/add): Merge conflict in vector/build.gradle Auto-merging vector/lint.xml CONFLICT (add/add): Merge conflict in vector/lint.xml Auto-merging vector/src/androidTest/java/im/vector/app/RegistrationTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/RegistrationTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt Auto-merging vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt CONFLICT (add/add): Merge conflict in vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt Auto-merging vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt Auto-merging vector/src/debug/res/layout/activity_debug_menu.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_debug_menu.xml Auto-merging vector/src/debug/res/layout/activity_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_linkify.xml Auto-merging vector/src/debug/res/layout/activity_test_material_theme.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/activity_test_material_theme.xml Auto-merging vector/src/debug/res/layout/demo_themes.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/demo_themes.xml Auto-merging vector/src/debug/res/layout/item_sas_emoji.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_sas_emoji.xml Auto-merging vector/src/debug/res/layout/item_test_linkify.xml CONFLICT (add/add): Merge conflict in vector/src/debug/res/layout/item_test_linkify.xml Auto-merging vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt Auto-merging vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt Auto-merging vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt CONFLICT (add/add): Merge conflict in vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt Auto-merging vector/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in vector/src/main/AndroidManifest.xml Auto-merging vector/src/main/assets/open_source_licenses.html CONFLICT (add/add): Merge conflict in vector/src/main/assets/open_source_licenses.html Auto-merging vector/src/main/java/im/vector/app/AppStateHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/AppStateHandler.kt Auto-merging vector/src/main/java/im/vector/app/VectorApplication.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/VectorApplication.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt Auto-merging vector/src/main/java/im/vector/app/core/di/FragmentModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/FragmentModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorComponent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorComponent.kt Auto-merging vector/src/main/java/im/vector/app/core/di/VectorModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/VectorModule.kt Auto-merging vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt Auto-merging vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Activity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Activity.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/EditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/EditText.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Fragment.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/LiveData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/LiveData.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Session.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Session.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/Set.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/Set.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TextView.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt Auto-merging vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt Auto-merging vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt Auto-merging vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/StateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/StateView.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt Auto-merging vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt Auto-merging vector/src/main/java/im/vector/app/core/services/CallService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/CallService.kt Auto-merging vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt Auto-merging vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DataSource.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Debouncer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Debouncer.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Emoji.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Emoji.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FileUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FileUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/Handler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/Handler.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/TextUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/TextUtils.kt Auto-merging vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/MainActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/MainActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt Auto-merging vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/call/CallControlsView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/CallControlsView.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt Auto-merging vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt Auto-merging vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt Auto-merging vector/src/main/java/im/vector/app/features/command/Command.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/Command.kt Auto-merging vector/src/main/java/im/vector/app/features/command/CommandParser.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/CommandParser.kt Auto-merging vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt Auto-merging vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt Auto-merging vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt Auto-merging vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/ScSdkPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt Auto-merging vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginAction.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginConfig.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginConfig.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginMode.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt Auto-merging vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt Auto-merging vector/src/main/java/im/vector/app/features/navigation/Navigator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/navigation/Navigator.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt Auto-merging vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinLocker.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinLocker.kt Auto-merging vector/src/main/java/im/vector/app/features/pin/PinMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/pin/PinMode.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt Auto-merging vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt Auto-merging vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt Auto-merging vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt Auto-merging vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt Auto-merging vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt Auto-merging vector/src/main/java/im/vector/app/features/session/SessionListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/session/SessionListener.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt Auto-merging vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/share/SharedData.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/share/SharedData.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt Auto-merging vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt Auto-merging vector/src/main/java/im/vector/app/features/terms/TermsController.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/terms/TermsController.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt Auto-merging vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt Auto-merging vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt Auto-merging vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt CONFLICT (add/add): Merge conflict in vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt Auto-merging vector/src/main/res/drawable/bg_group_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/bg_group_item.xml Auto-merging vector/src/main/res/drawable/ic_arrow_right.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_arrow_right.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_catchup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_catchup.xml Auto-merging vector/src/main/res/drawable/ic_home_bottom_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_home_bottom_group.xml Auto-merging vector/src/main/res/drawable/ic_noun_party_popper.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_noun_party_popper.xml Auto-merging vector/src/main/res/drawable/ic_trash_24.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/drawable/ic_trash_24.xml Auto-merging vector/src/main/res/layout/activity.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity.xml Auto-merging vector/src/main/res/layout/activity_bug_report.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_bug_report.xml Auto-merging vector/src/main/res/layout/activity_call.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_call.xml Auto-merging vector/src/main/res/layout/activity_emoji_reaction_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_emoji_reaction_picker.xml Auto-merging vector/src/main/res/layout/activity_filtered_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_filtered_rooms.xml Auto-merging vector/src/main/res/layout/activity_home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_home.xml Auto-merging vector/src/main/res/layout/activity_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_incoming_share.xml Auto-merging vector/src/main/res/layout/activity_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_login.xml Auto-merging vector/src/main/res/layout/activity_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_room_detail.xml Auto-merging vector/src/main/res/layout/activity_search.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_search.xml Auto-merging vector/src/main/res/layout/activity_simple.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_simple.xml Auto-merging vector/src/main/res/layout/activity_vector_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_vector_settings.xml Auto-merging vector/src/main/res/layout/activity_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/activity_widget.xml Auto-merging vector/src/main/res/layout/alerter_verification_layout.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/alerter_verification_layout.xml Auto-merging vector/src/main/res/layout/bottom_sheet_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_call_controls.xml Auto-merging vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml Auto-merging vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml Auto-merging vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml Auto-merging vector/src/main/res/layout/bottom_sheet_verification.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/bottom_sheet_verification.xml Auto-merging vector/src/main/res/layout/custom_action_item_layout_badge.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/custom_action_item_layout_badge.xml Auto-merging vector/src/main/res/layout/dialog_base_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_base_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_change_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_change_password.xml Auto-merging vector/src/main/res/layout/dialog_disclaimer_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_disclaimer_content.xml Auto-merging vector/src/main/res/layout/dialog_event_content.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_event_content.xml Auto-merging vector/src/main/res/layout/dialog_export_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_export_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_import_e2e_keys.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_import_e2e_keys.xml Auto-merging vector/src/main/res/layout/dialog_preference_edit_text.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_preference_edit_text.xml Auto-merging vector/src/main/res/layout/dialog_prompt_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/dialog_prompt_password.xml Auto-merging vector/src/main/res/layout/fragment_attachments_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_attachments_preview.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml Auto-merging vector/src/main/res/layout/fragment_contacts_book.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_contacts_book.xml Auto-merging vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml Auto-merging vector/src/main/res/layout/fragment_create_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_create_room.xml Auto-merging vector/src/main/res/layout/fragment_deactivate_account.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_deactivate_account.xml Auto-merging vector/src/main/res/layout/fragment_generic_recycler.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_generic_recycler.xml Auto-merging vector/src/main/res/layout/fragment_home_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_detail.xml Auto-merging vector/src/main/res/layout/fragment_home_drawer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_home_drawer.xml Auto-merging vector/src/main/res/layout/fragment_incoming_share.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_incoming_share.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_restore_success.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_restore_success.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml Auto-merging vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml Auto-merging vector/src/main/res/layout/fragment_loading.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_loading.xml Auto-merging vector/src/main/res/layout/fragment_login.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login.xml Auto-merging vector/src/main/res/layout/fragment_login_reset_password.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_reset_password.xml Auto-merging vector/src/main/res/layout/fragment_login_server_url_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_server_url_form.xml Auto-merging vector/src/main/res/layout/fragment_login_signup_signin_selection.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_signup_signin_selection.xml Auto-merging vector/src/main/res/layout/fragment_login_splash.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_splash.xml Auto-merging vector/src/main/res/layout/fragment_login_terms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_login_terms.xml Auto-merging vector/src/main/res/layout/fragment_matrix_profile.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_matrix_profile.xml Auto-merging vector/src/main/res/layout/fragment_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_pin.xml Auto-merging vector/src/main/res/layout/fragment_public_rooms.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_public_rooms.xml Auto-merging vector/src/main/res/layout/fragment_qr_code_scanner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_qr_code_scanner.xml Auto-merging vector/src/main/res/layout/fragment_room_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_detail.xml Auto-merging vector/src/main/res/layout/fragment_room_directory_picker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_directory_picker.xml Auto-merging vector/src/main/res/layout/fragment_room_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_list.xml Auto-merging vector/src/main/res/layout/fragment_room_member_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_member_list.xml Auto-merging vector/src/main/res/layout/fragment_room_preview_no_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_preview_no_preview.xml Auto-merging vector/src/main/res/layout/fragment_room_setting_generic.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_setting_generic.xml Auto-merging vector/src/main/res/layout/fragment_room_uploads.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_uploads.xml Auto-merging vector/src/main/res/layout/fragment_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_room_widget.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_key.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_key.xml Auto-merging vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml Auto-merging vector/src/main/res/layout/fragment_user_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/fragment_user_directory.xml Auto-merging vector/src/main/res/layout/item_attachment_big_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_big_preview.xml Auto-merging vector/src/main/res/layout/item_attachment_miniature_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_attachment_miniature_preview.xml Auto-merging vector/src/main/res/layout/item_autocomplete_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_autocomplete_matrix_item.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_action.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_message_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_message_preview.xml Auto-merging vector/src/main/res/layout/item_bottom_sheet_room_preview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_bottom_sheet_room_preview.xml Auto-merging vector/src/main/res/layout/item_breadcrumbs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_breadcrumbs.xml Auto-merging vector/src/main/res/layout/item_contact_detail.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_detail.xml Auto-merging vector/src/main/res/layout/item_contact_main.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_contact_main.xml Auto-merging vector/src/main/res/layout/item_create_direct_room_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_create_direct_room_user.xml Auto-merging vector/src/main/res/layout/item_device.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_device.xml Auto-merging vector/src/main/res/layout/item_display_read_receipt.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_display_read_receipt.xml Auto-merging vector/src/main/res/layout/item_editable_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_editable_avatar.xml Auto-merging vector/src/main/res/layout/item_emoji_verif.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_emoji_verif.xml Auto-merging vector/src/main/res/layout/item_expandable_textview.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_expandable_textview.xml Auto-merging vector/src/main/res/layout/item_form_switch.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_switch.xml Auto-merging vector/src/main/res/layout/item_form_text_input.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_form_text_input.xml Auto-merging vector/src/main/res/layout/item_generic_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_list.xml Auto-merging vector/src/main/res/layout/item_generic_with_value.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_generic_with_value.xml Auto-merging vector/src/main/res/layout/item_group.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_group.xml Auto-merging vector/src/main/res/layout/item_help_footer.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_help_footer.xml Auto-merging vector/src/main/res/layout/item_known_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_known_user.xml Auto-merging vector/src/main/res/layout/item_login_password_form.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_login_password_form.xml Auto-merging vector/src/main/res/layout/item_notification_troubleshoot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_notification_troubleshoot.xml Auto-merging vector/src/main/res/layout/item_profile_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_action.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item.xml Auto-merging vector/src/main/res/layout/item_profile_matrix_item_progress.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_profile_matrix_item_progress.xml Auto-merging vector/src/main/res/layout/item_public_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_public_room.xml Auto-merging vector/src/main/res/layout/item_pushrule_raw.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_pushrule_raw.xml Auto-merging vector/src/main/res/layout/item_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room.xml Auto-merging vector/src/main/res/layout/item_room_directory.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_directory.xml Auto-merging vector/src/main/res/layout/item_room_invitation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_invitation.xml Auto-merging vector/src/main/res/layout/item_room_widget.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_room_widget.xml Auto-merging vector/src/main/res/layout/item_search_result.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_search_result.xml Auto-merging vector/src/main/res/layout/item_settings_three_pid.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_settings_three_pid.xml Auto-merging vector/src/main/res/layout/item_simple_reaction_info.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_simple_reaction_info.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_noinfo.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_noinfo.xml Auto-merging vector/src/main/res/layout/item_timeline_event_base_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_base_state.xml Auto-merging vector/src/main/res/layout/item_timeline_event_day_separator.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_day_separator.xml Auto-merging vector/src/main/res/layout/item_timeline_event_default_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_default_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_file_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_file_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_media_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_media_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_notice_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_notice_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_poll_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_poll_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_event_text_message_stub.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_event_text_message_stub.xml Auto-merging vector/src/main/res/layout/item_timeline_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_timeline_read_marker.xml Auto-merging vector/src/main/res/layout/item_tos.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_tos.xml Auto-merging vector/src/main/res/layout/item_unknown_room.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_unknown_room.xml Auto-merging vector/src/main/res/layout/item_uploads_file.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_file.xml Auto-merging vector/src/main/res/layout/item_uploads_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_image.xml Auto-merging vector/src/main/res/layout/item_uploads_video.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_uploads_video.xml Auto-merging vector/src/main/res/layout/item_user.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_user.xml Auto-merging vector/src/main/res/layout/item_verification_action.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_action.xml Auto-merging vector/src/main/res/layout/item_verification_big_image.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_big_image.xml Auto-merging vector/src/main/res/layout/item_verification_qr_code.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_qr_code.xml Auto-merging vector/src/main/res/layout/item_verification_wait.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/item_verification_wait.xml Auto-merging vector/src/main/res/layout/merge_overlay_waiting_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/merge_overlay_waiting_view.xml Auto-merging vector/src/main/res/layout/reaction_button.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/reaction_button.xml Auto-merging vector/src/main/res/layout/vector_invite_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_invite_view.xml Auto-merging vector/src/main/res/layout/vector_message_merge_avatar_list.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_message_merge_avatar_list.xml Auto-merging vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_list_preference_with_warning.xml Auto-merging vector/src/main/res/layout/vector_settings_round_avatar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/vector_settings_round_avatar.xml Auto-merging vector/src/main/res/layout/view_active_conference_view.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_active_conference_view.xml Auto-merging vector/src/main/res/layout/view_attachment_type_selector.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_attachment_type_selector.xml Auto-merging vector/src/main/res/layout/view_button_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_button_state.xml Auto-merging vector/src/main/res/layout/view_call_controls.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_call_controls.xml Auto-merging vector/src/main/res/layout/view_file_icon.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_file_icon.xml Auto-merging vector/src/main/res/layout/view_keys_backup_banner.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_keys_backup_banner.xml Auto-merging vector/src/main/res/layout/view_notification_area.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_notification_area.xml Auto-merging vector/src/main/res/layout/view_read_marker.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_marker.xml Auto-merging vector/src/main/res/layout/view_read_receipts.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_read_receipts.xml Auto-merging vector/src/main/res/layout/view_state.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_state.xml Auto-merging vector/src/main/res/layout/view_stub_room_member_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_member_profile_header.xml Auto-merging vector/src/main/res/layout/view_stub_room_profile_header.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/layout/view_stub_room_profile_header.xml Auto-merging vector/src/main/res/menu/home.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home.xml Auto-merging vector/src/main/res/menu/home_bottom_navigation.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/home_bottom_navigation.xml Auto-merging vector/src/main/res/menu/menu_timeline.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/menu/menu_timeline.xml Auto-merging vector/src/main/res/raw/emoji_picker_datasource.json CONFLICT (add/add): Merge conflict in vector/src/main/res/raw/emoji_picker_datasource.json Auto-merging vector/src/main/res/values-ar/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ar/strings.xml Auto-merging vector/src/main/res/values-az/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-az/strings.xml Auto-merging vector/src/main/res/values-b+sr+Latn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-b+sr+Latn/strings.xml Auto-merging vector/src/main/res/values-bg/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bg/strings.xml Auto-merging vector/src/main/res/values-bn-rBD/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rBD/strings.xml Auto-merging vector/src/main/res/values-bn-rIN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bn-rIN/strings.xml Auto-merging vector/src/main/res/values-bs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-bs/strings.xml Auto-merging vector/src/main/res/values-ca/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ca/strings.xml Auto-merging vector/src/main/res/values-cs/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cs/strings.xml Auto-merging vector/src/main/res/values-cy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-cy/strings.xml Auto-merging vector/src/main/res/values-da/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-da/strings.xml Auto-merging vector/src/main/res/values-de/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings.xml Auto-merging vector/src/main/res/values-de/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-de/strings_sc.xml Auto-merging vector/src/main/res/values-el/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-el/strings.xml Auto-merging vector/src/main/res/values-eo/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eo/strings.xml Auto-merging vector/src/main/res/values-es-rMX/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es-rMX/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-et/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-et/strings.xml Auto-merging vector/src/main/res/values-eu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-eu/strings.xml Auto-merging vector/src/main/res/values-fa/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fa/strings.xml Auto-merging vector/src/main/res/values-fi/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fi/strings.xml Auto-merging vector/src/main/res/values-fr-rCA/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr-rCA/strings.xml Auto-merging vector/src/main/res/values-fr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fr/strings.xml Auto-merging vector/src/main/res/values-fy/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-fy/strings.xml Auto-merging vector/src/main/res/values-gl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-gl/strings.xml Auto-merging vector/src/main/res/values-hr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hr/strings.xml Auto-merging vector/src/main/res/values-hu/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-hu/strings.xml Auto-merging vector/src/main/res/values-in/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-in/strings.xml Auto-merging vector/src/main/res/values-is/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-is/strings.xml Auto-merging vector/src/main/res/values-it/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-it/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-kab/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-kab/strings.xml Auto-merging vector/src/main/res/values-ko/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ko/strings.xml Auto-merging vector/src/main/res/values-lt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lt/strings.xml Auto-merging vector/src/main/res/values-lv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-lv/strings.xml Auto-merging vector/src/main/res/values-nb-rNO/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nb-rNO/strings.xml Auto-merging vector/src/main/res/values-nl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nl/strings.xml Auto-merging vector/src/main/res/values-nn/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-nn/strings.xml Auto-merging vector/src/main/res/values-pl/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pl/strings.xml Auto-merging vector/src/main/res/values-pt-rBR/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt-rBR/strings.xml Auto-merging vector/src/main/res/values-pt/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-pt/strings.xml Auto-merging vector/src/main/res/values-ro/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ro/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-ru/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-ru/strings_sc.xml Auto-merging vector/src/main/res/values-sk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sk/strings.xml Auto-merging vector/src/main/res/values-sq/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sq/strings.xml Auto-merging vector/src/main/res/values-sr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sr/strings.xml Auto-merging vector/src/main/res/values-sv/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-sv/strings.xml Auto-merging vector/src/main/res/values-te/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-te/strings.xml Auto-merging vector/src/main/res/values-th/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-th/strings.xml Auto-merging vector/src/main/res/values-tlh/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tlh/strings.xml Auto-merging vector/src/main/res/values-tr/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tr/strings.xml Auto-merging vector/src/main/res/values-tzm/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-tzm/strings.xml Auto-merging vector/src/main/res/values-uk/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-vls/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-vls/strings.xml Auto-merging vector/src/main/res/values-w820dp/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-w820dp/dimens_sc.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-zh-rTW/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values/array.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/array.xml Auto-merging vector/src/main/res/values/attrs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs.xml Auto-merging vector/src/main/res/values/attrs_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/attrs_sc.xml Auto-merging vector/src/main/res/values/colors_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/colors_sc.xml Auto-merging vector/src/main/res/values/config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/config.xml Auto-merging vector/src/main/res/values/dimens.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens.xml Auto-merging vector/src/main/res/values/dimens_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/dimens_sc.xml Auto-merging vector/src/main/res/values/donottranslate.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/donottranslate.xml Auto-merging vector/src/main/res/values/font_certs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/font_certs.xml Auto-merging vector/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings.xml Auto-merging vector/src/main/res/values/strings_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/strings_sc.xml Auto-merging vector/src/main/res/values/style_snackbar.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/style_snackbar.xml Auto-merging vector/src/main/res/values/styles.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles.xml Auto-merging vector/src/main/res/values/styles_riot.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_riot.xml Auto-merging vector/src/main/res/values/styles_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/styles_sc.xml Auto-merging vector/src/main/res/values/theme_black.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_black.xml Auto-merging vector/src/main/res/values/theme_dark.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_dark.xml Auto-merging vector/src/main/res/values/theme_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_light.xml Auto-merging vector/src/main/res/values/theme_sc.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc.xml Auto-merging vector/src/main/res/values/theme_sc_light.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/values/theme_sc_light.xml Auto-merging vector/src/main/res/xml/network_security_config.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/network_security_config.xml Auto-merging vector/src/main/res/xml/vector_settings_advanced_settings.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_advanced_settings.xml Auto-merging vector/src/main/res/xml/vector_settings_general.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_general.xml Auto-merging vector/src/main/res/xml/vector_settings_labs.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_labs.xml Auto-merging vector/src/main/res/xml/vector_settings_pin.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_pin.xml Auto-merging vector/src/main/res/xml/vector_settings_preferences.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_preferences.xml Auto-merging vector/src/main/res/xml/vector_settings_security_privacy.xml CONFLICT (add/add): Merge conflict in vector/src/main/res/xml/vector_settings_security_privacy.xml error: could not apply dd8ebfbb36... Automatic SchildiChat string correction hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply dd8ebfbb36... Automatic SchildiChat string correction (1) 17 hours ago
None Received repository notification SchildiChat / SchildiChat-android	GitHub: https://github.com/SchildiChat/SchildiChat-android, sc 17 hours ago
None Failed rebase on repository SchildiChat / SchildiChat-android	Rebasing (1/11093) Auto-merging .github/ISSUE_TEMPLATE/bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .idea/codeStyles/Project.xml CONFLICT (add/add): Merge conflict in .idea/codeStyles/Project.xml Auto-merging .idea/dictionaries/bmarty.xml CONFLICT (add/add): Merge conflict in .idea/dictionaries/bmarty.xml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging AUTHORS.md CONFLICT (add/add): Merge conflict in AUTHORS.md Auto-merging CHANGES.md CONFLICT (add/add): Merge conflict in CHANGES.md Auto-merging CONTRIBUTING.md CONFLICT (add/add): Merge conflict in CONTRIBUTING.md Auto-merging PRIVACY.md CONFLICT (add/add): Merge conflict in PRIVACY.md Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging alternative_package.sh CONFLICT (add/add): Merge conflict in alternative_package.sh Auto-merging attachment-viewer/build.gradle CONFLICT (add/add): Merge conflict in attachment-viewer/build.gradle Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt Auto-merging attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt CONFLICT (add/add): Merge conflict in attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt Auto-merging build.gradle CONFLICT (add/add): Merge conflict in build.gradle Auto-merging correct_strings.sh CONFLICT (add/add): Merge conflict in correct_strings.sh Auto-merging docs/jitsi.md CONFLICT (add/add): Merge conflict in docs/jitsi.md Auto-merging docs/notifications.md CONFLICT (add/add): Merge conflict in docs/notifications.md Auto-merging docs/signin.md CONFLICT (add/add): Merge conflict in docs/signin.md Auto-merging docs/ui-tests.md CONFLICT (add/add): Merge conflict in docs/ui-tests.md Auto-merging fastlane/metadata/android/de-DE/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/de-DE/full_description.txt Auto-merging fastlane/metadata/android/en-US/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/en-US/full_description.txt Auto-merging fastlane/metadata/android/ru-RU/full_description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/android/ru-RU/full_description.txt Auto-merging gradle.properties CONFLICT (add/add): Merge conflict in gradle.properties Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging graphics/materialdesignicons/README.md CONFLICT (add/add): Merge conflict in graphics/materialdesignicons/README.md Auto-merging increment_version.sh CONFLICT (add/add): Merge conflict in increment_version.sh Auto-merging matrix-sdk-android-rx/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/build.gradle Auto-merging matrix-sdk-android-rx/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/AndroidManifest.xml Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt Auto-merging matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt Auto-merging matrix-sdk-android/build.gradle CONFLICT (add/add): Merge conflict in matrix-sdk-android/build.gradle Auto-merging matrix-sdk-android/proguard-rules.pro CONFLICT (add/add): Merge conflict in matrix-sdk-android/proguard-rules.pro Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt Auto-merging matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt Auto-merging matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt CONFLICT (add/add): Merge conflict in matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt Auto-merging matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt CONFLICT (add/add): Merge conflict in matrix-sdk-