diff --git a/app/src/androidTest/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialogIT.java b/app/src/androidTest/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialogIT.java
new file mode 100644
index 000000000000..8804a6b0154a
--- /dev/null
+++ b/app/src/androidTest/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialogIT.java
@@ -0,0 +1,204 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2020 Tobias Kaminsky
+ * Copyright (C) 2020 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.nmc.android.ui.conflict;
+
+import android.content.Intent;
+
+import com.nextcloud.client.account.UserAccountManagerImpl;
+import com.owncloud.android.AbstractIT;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.OCUpload;
+import com.owncloud.android.ui.activity.ConflictsResolveActivity;
+import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
+import com.owncloud.android.utils.FileStorageUtils;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+
+import androidx.test.espresso.intent.rule.IntentsTestRule;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class ConflictsResolveConsentDialogIT extends AbstractIT {
+    @Rule public IntentsTestRule<ConflictsResolveActivity> activityRule =
+        new IntentsTestRule<>(ConflictsResolveActivity.class, true, false);
+    private boolean returnCode;
+
+    @Test
+    public void replaceWithNewFile() {
+        returnCode = false;
+
+        OCUpload newUpload = new OCUpload(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt",
+                                          "/newFile.txt",
+                                          user.getAccountName());
+
+        OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setFileLength(1024000);
+        existingFile.setModificationTimestamp(1582019340);
+        existingFile.setRemoteId("00000123abc");
+
+        OCFile newFile = new OCFile("/newFile.txt");
+        newFile.setFileLength(56000);
+        newFile.setModificationTimestamp(1522019340);
+        newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
+
+        FileDataStorageManager storageManager = new FileDataStorageManager(user, targetContext.getContentResolver());
+        storageManager.saveNewFile(existingFile);
+
+        Intent intent = new Intent(targetContext, ConflictsResolveActivity.class);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_FILE, newFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_EXISTING_FILE, existingFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_CONFLICT_UPLOAD_ID, newUpload.getUploadId());
+        intent.putExtra(ConflictsResolveActivity.EXTRA_LAUNCHED_FROM_TEST, true);
+
+        ConflictsResolveActivity sut = activityRule.launchActivity(intent);
+
+        ConflictsResolveConsentDialog dialog = ConflictsResolveConsentDialog.newInstance(existingFile,
+                                                                                         newFile,
+                                                                                         UserAccountManagerImpl
+                                                                                             .fromContext(targetContext)
+                                                                                             .getUser()
+                                                                                        );
+        dialog.showDialog(sut);
+
+        sut.listener = decision -> {
+            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_LOCAL);
+            returnCode = true;
+        };
+
+        getInstrumentation().waitForIdleSync();
+
+        onView(withId(R.id.replace_btn)).perform(click());
+
+        assertTrue(returnCode);
+    }
+
+    @Test
+    public void keepBothFiles() {
+        returnCode = false;
+
+        OCUpload newUpload = new OCUpload(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt",
+                                          "/newFile.txt",
+                                          user.getAccountName());
+
+        OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setFileLength(1024000);
+        existingFile.setModificationTimestamp(1582019340);
+
+        OCFile newFile = new OCFile("/newFile.txt");
+        newFile.setFileLength(56000);
+        newFile.setModificationTimestamp(1522019340);
+        newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
+
+        FileDataStorageManager storageManager = new FileDataStorageManager(user, targetContext.getContentResolver());
+        storageManager.saveNewFile(existingFile);
+
+        Intent intent = new Intent(targetContext, ConflictsResolveActivity.class);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_FILE, newFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_EXISTING_FILE, existingFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_CONFLICT_UPLOAD_ID, newUpload.getUploadId());
+        intent.putExtra(ConflictsResolveActivity.EXTRA_LAUNCHED_FROM_TEST, true);
+
+        ConflictsResolveActivity sut = activityRule.launchActivity(intent);
+
+        ConflictsResolveConsentDialog dialog = ConflictsResolveConsentDialog.newInstance(existingFile,
+                                                                                         newFile,
+                                                                                         UserAccountManagerImpl
+                                                                                             .fromContext(targetContext)
+                                                                                             .getUser()
+                                                                                        );
+        dialog.showDialog(sut);
+
+        sut.listener = decision -> {
+            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_BOTH);
+            returnCode = true;
+        };
+
+        getInstrumentation().waitForIdleSync();
+
+        onView(withId(R.id.keep_both_btn)).perform(click());
+
+        assertTrue(returnCode);
+    }
+
+    @Test
+    public void keepExistingFile() {
+        returnCode = false;
+
+        OCUpload newUpload = new OCUpload(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt",
+                                          "/newFile.txt",
+                                          user.getAccountName());
+
+        OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setFileLength(1024000);
+        existingFile.setModificationTimestamp(1582019340);
+
+        OCFile newFile = new OCFile("/newFile.txt");
+        newFile.setFileLength(56000);
+        newFile.setModificationTimestamp(1522019340);
+        newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
+
+        FileDataStorageManager storageManager = new FileDataStorageManager(user, targetContext.getContentResolver());
+        storageManager.saveNewFile(existingFile);
+
+        Intent intent = new Intent(targetContext, ConflictsResolveActivity.class);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_FILE, newFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_EXISTING_FILE, existingFile);
+        intent.putExtra(ConflictsResolveActivity.EXTRA_CONFLICT_UPLOAD_ID, newUpload.getUploadId());
+        intent.putExtra(ConflictsResolveActivity.EXTRA_LAUNCHED_FROM_TEST, true);
+
+        ConflictsResolveActivity sut = activityRule.launchActivity(intent);
+
+        ConflictsResolveConsentDialog dialog = ConflictsResolveConsentDialog.newInstance(existingFile,
+                                                                                         newFile,
+                                                                                         UserAccountManagerImpl
+                                                                                             .fromContext(targetContext)
+                                                                                             .getUser()
+                                                                                        );
+        dialog.showDialog(sut);
+
+        sut.listener = decision -> {
+            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_SERVER);
+            returnCode = true;
+        };
+
+        getInstrumentation().waitForIdleSync();
+
+        onView(withId(R.id.cancel_keep_existing_btn)).perform(click());
+
+        assertTrue(returnCode);
+    }
+
+    @After
+    public void after() {
+        getStorageManager().deleteAllFiles();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialog.java b/app/src/main/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialog.java
new file mode 100644
index 000000000000..a192e2416191
--- /dev/null
+++ b/app/src/main/java/com/nmc/android/ui/conflict/ConflictsResolveConsentDialog.java
@@ -0,0 +1,197 @@
+/*
+ *   ownCloud Android client application
+ *
+ *   @author Bartek Przybylski
+ *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2015 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.nmc.android.ui.conflict;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
+
+import com.nextcloud.client.account.User;
+import com.owncloud.android.R;
+import com.owncloud.android.databinding.ConflictResolveConsentDialogBinding;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
+
+import java.io.File;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+
+/**
+ * Dialog which will be displayed to user upon keep-in-sync file conflict.
+ */
+public class ConflictsResolveConsentDialog extends DialogFragment {
+
+    private ConflictResolveConsentDialogBinding binding;
+
+    private OCFile existingFile;
+    private File newFile;
+    public ConflictsResolveDialog.OnConflictDecisionMadeListener listener;
+    private User user;
+
+    private static final String KEY_NEW_FILE = "file";
+    private static final String KEY_EXISTING_FILE = "ocfile";
+    private static final String KEY_USER = "user";
+
+    public static ConflictsResolveConsentDialog newInstance(OCFile existingFile, OCFile newFile, User user) {
+        ConflictsResolveConsentDialog dialog = new ConflictsResolveConsentDialog();
+
+        Bundle args = new Bundle();
+        args.putParcelable(KEY_EXISTING_FILE, existingFile);
+        args.putSerializable(KEY_NEW_FILE, new File(newFile.getStoragePath()));
+        args.putParcelable(KEY_USER, user);
+        dialog.setArguments(args);
+
+        return dialog;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            listener = (ConflictsResolveDialog.OnConflictDecisionMadeListener) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException("Activity of this dialog must implement OnConflictDecisionMadeListener");
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        AlertDialog alertDialog = (AlertDialog) getDialog();
+
+        if (alertDialog == null) {
+            Toast.makeText(getContext(), "Failed to create conflict dialog", Toast.LENGTH_LONG).show();
+            return;
+        }
+
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            existingFile = savedInstanceState.getParcelable(KEY_EXISTING_FILE);
+            newFile = (File) savedInstanceState.getSerializable(KEY_NEW_FILE);
+            user = savedInstanceState.getParcelable(KEY_USER);
+        } else if (getArguments() != null) {
+            existingFile = getArguments().getParcelable(KEY_EXISTING_FILE);
+            newFile = (File) getArguments().getSerializable(KEY_NEW_FILE);
+            user = getArguments().getParcelable(KEY_USER);
+        } else {
+            Toast.makeText(getContext(), "Failed to create conflict dialog", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putParcelable(KEY_EXISTING_FILE, existingFile);
+        outState.putSerializable(KEY_NEW_FILE, newFile);
+        outState.putParcelable(KEY_USER, user);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Inflate the layout for the dialog
+        binding = ConflictResolveConsentDialogBinding.inflate(requireActivity().getLayoutInflater());
+
+        // TODO: 26-05-2021 change replace and keep both button text for multiple files
+        binding.replaceBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.conflictDecisionMade(ConflictsResolveDialog.Decision.KEEP_LOCAL);
+                }
+            }
+        });
+
+        binding.keepBothBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.conflictDecisionMade(ConflictsResolveDialog.Decision.KEEP_BOTH);
+                }
+            }
+        });
+
+        binding.moreDetailsBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            }
+        });
+
+        binding.cancelKeepExistingBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.conflictDecisionMade(ConflictsResolveDialog.Decision.KEEP_SERVER);
+                }
+            }
+        });
+
+        // Build the dialog
+        // TODO: 26-05-2021 Handle multiple dialog message
+        String dialogMessage = String.format(getString(R.string.conflict_dialog_message),
+                                             existingFile.getDecryptedFileName());
+        AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
+        builder.setView(binding.getRoot())
+            // TODO: 26-05-2021 handle multiple dialog title
+            .setTitle(getString(R.string.conflict_dialog_title))
+            .setMessage(dialogMessage);
+
+
+        return builder.create();
+    }
+
+    public void showDialog(AppCompatActivity activity) {
+        Fragment prev = activity.getSupportFragmentManager().findFragmentByTag("dialog");
+        FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
+        if (prev != null) {
+            ft.remove(prev);
+        }
+        ft.addToBackStack(null);
+
+        this.show(ft, "dialog");
+    }
+
+    @Override
+    public void onCancel(@NonNull DialogInterface dialog) {
+        if (listener != null) {
+            listener.conflictDecisionMade(ConflictsResolveDialog.Decision.CANCEL);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index 18de79ad31df..9d12c88650f4 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -534,13 +534,13 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
                 return collisionResult;
             }
 
-            mFile.setDecryptedRemotePath(parentFile.getDecryptedRemotePath() + originalFile.getName());
+            mFile.setDecryptedRemotePath(parentFile.getDecryptedRemotePath() + mFile.getFileName());
             String expectedPath = FileStorageUtils.getDefaultSavePathFor(user.getAccountName(), mFile);
             expectedFile = new File(expectedPath);
 
             result = copyFile(originalFile, expectedPath);
             if (!result.isSuccess()) {
-                return result;
+                return returnGracefully(temporalFile, token, parentFile, client, result);
             }
 
             // Get the last modification date of the file from the file system
@@ -646,7 +646,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
             }
 
             if (result.isSuccess()) {
-                mFile.setDecryptedRemotePath(parentFile.getDecryptedRemotePath() + originalFile.getName());
+                mFile.setDecryptedRemotePath(parentFile.getDecryptedRemotePath() + mFile.getFileName());
                 mFile.setRemotePath(parentFile.getRemotePath() + encryptedFileName);
 
 
@@ -767,11 +767,30 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
             getStorageManager().saveConflict(mFile, mFile.getEtagInConflict());
         }
 
+        return returnGracefully(temporalFile, token, parentFile, client, result);
+    }
+
+    private RemoteOperationResult returnGracefully(
+        File temporalFile,
+        String token,
+        OCFile parentFile,
+        OwnCloudClient client,
+        RemoteOperationResult result) {
         // delete temporal file
         if (temporalFile != null && temporalFile.exists() && !temporalFile.delete()) {
             Log_OC.e(TAG, "Could not delete temporal file " + temporalFile.getAbsolutePath());
         }
 
+        // unlock must be done always
+        if (token != null) {
+            RemoteOperationResult unlockFolderResult = EncryptionUtils.unlockFolder(parentFile,
+                                                                                    client,
+                                                                                    token);
+
+            if (!unlockFolderResult.isSuccess()) {
+                return unlockFolderResult;
+            }
+        }
         return result;
     }
 
@@ -1045,6 +1064,26 @@ private RemoteOperationResult checkNameCollision(OwnCloudClient client,
                     break;
                 case OVERWRITE:
                     Log_OC.d(TAG, "Overwriting file");
+                    if (encrypted) {
+                        OCFile file = getStorageManager().getFileByDecryptedRemotePath(mRemotePath);
+
+                        if (file != null) {
+                            RemoteOperationResult removeResult = new RemoveFileOperation(file,
+                                                                                         false,
+                                                                                         user,
+                                                                                         true,
+                                                                                         mContext,
+                                                                                         getStorageManager())
+                                .execute(client);
+
+                            if (!removeResult.isSuccess()) {
+                                throw new IllegalArgumentException("Failed to remove old encrypted file!");
+                            }
+
+                        } else {
+                            throw new IllegalArgumentException("File to remove is null!");
+                        }
+                    }
                     break;
                 case ASK_USER:
                     Log_OC.d(TAG, "Name collision; asking the user what to do");
@@ -1188,6 +1227,7 @@ private void createNewOCFile(String newRemotePath) {
         newFile.setLastSyncDateForData(mFile.getLastSyncDateForData());
         newFile.setStoragePath(mFile.getStoragePath());
         newFile.setParentId(mFile.getParentId());
+        newFile.setEncrypted(mFile.isEncrypted());
         mOldFile = mFile;
         mFile = newFile;
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
index a83e5c6dd000..85741b1e2fd3 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
@@ -20,6 +20,7 @@ import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.jobs.upload.UploadNotificationManager
 import com.nextcloud.model.HTTPStatusCodes
 import com.nextcloud.utils.extensions.getParcelableArgument
+import com.nmc.android.ui.conflict.ConflictsResolveConsentDialog
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
@@ -29,7 +30,6 @@ import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation
 import com.owncloud.android.lib.resources.files.model.RemoteFile
-import com.owncloud.android.ui.dialog.ConflictsResolveDialog
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener
 import com.owncloud.android.utils.FileStorageUtils
@@ -114,7 +114,9 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
                 }
 
                 Decision.KEEP_SERVER -> {
-                    if (!shouldDeleteLocal()) {
+                    if (newFile?.isEncrypted == true) {
+                        // NMC-2361 fix
+                    } else if (!shouldDeleteLocal()) {
                         // Overwrite local file
                         file?.let {
                             FileDownloadHelper.instance().downloadFile(
@@ -204,7 +206,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
             fragmentTransaction.remove(prev)
         }
         if (existingFile != null && storageManager.fileExists(remotePath)) {
-            val dialog = ConflictsResolveDialog.newInstance(
+            val dialog = ConflictsResolveConsentDialog.newInstance(
                 existingFile,
                 newFile,
                 userOptional.get()
@@ -219,9 +221,15 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
 
     private fun showErrorAndFinish(code: Int? = null) {
         val message = parseErrorMessage(code)
-        runOnUiThread {
-            Toast.makeText(this, message, Toast.LENGTH_LONG).show()
-            finish()
+        // NMC Customization
+        // if activity is launched from test case then don't finish the activity as it is required to show the dialog
+        // but during normal app run activity should finish during error so we have to pass it false or don't pass
+        // anything
+        if (!intent.getBooleanExtra(EXTRA_LAUNCHED_FROM_TEST, false)) {
+            runOnUiThread {
+                Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+                finish()
+            }
         }
     }
 
@@ -251,6 +259,10 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
          */
         const val EXTRA_LOCAL_BEHAVIOUR = "LOCAL_BEHAVIOUR"
         const val EXTRA_EXISTING_FILE = "EXISTING_FILE"
+        /**
+         * variable to tell activity that it has been launched from test class
+         */
+        const val EXTRA_LAUNCHED_FROM_TEST = "LAUNCHED_FROM_TEST"
         private val TAG = ConflictsResolveActivity::class.java.simpleName
 
         @JvmStatic
@@ -266,6 +278,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
                 intent.flags = intent.flags or flag
             }
             intent.putExtra(EXTRA_FILE, file)
+            intent.putExtra(EXTRA_EXISTING_FILE, file)
             intent.putExtra(EXTRA_USER, user)
             intent.putExtra(EXTRA_CONFLICT_UPLOAD_ID, conflictUploadId)
             return intent
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index 2ee4e4e20576..46f6d719ad12 100755
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -567,11 +567,11 @@ private boolean checkAndOpenConflictResolutionDialog(User user,
                                                          OCUpload item,
                                                          String status) {
         String remotePath = item.getRemotePath();
-        OCFile localFile = storageManager.getFileByEncryptedRemotePath(remotePath);
+        OCFile localFile = storageManager.getFileByDecryptedRemotePath(remotePath);
 
         if (localFile == null) {
             // Remote file doesn't exist, try to refresh folder
-            OCFile folder = storageManager.getFileByEncryptedRemotePath(new File(remotePath).getParent() + "/");
+            OCFile folder = storageManager.getFileByDecryptedRemotePath(new File(remotePath).getParent() + "/");
 
             if (folder != null && folder.isFolder()) {
                 refreshFolderAndUpdateUI(itemViewHolder, user, folder, remotePath, item, status);
diff --git a/app/src/main/res/color/dialog_positive_btn_color.xml b/app/src/main/res/color/dialog_positive_btn_color.xml
new file mode 100644
index 000000000000..5913e0da1a1d
--- /dev/null
+++ b/app/src/main/res/color/dialog_positive_btn_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary" android:state_enabled="true" />
+    <item android:color="@color/grey_30" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/conflict_resolve_consent_dialog.xml b/app/src/main/res/layout-land/conflict_resolve_consent_dialog.xml
new file mode 100644
index 000000000000..325749554862
--- /dev/null
+++ b/app/src/main/res/layout-land/conflict_resolve_consent_dialog.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/standard_padding">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/replace_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_replace"
+        android:textAllCaps="false"
+        android:layout_marginEnd="@dimen/standard_margin"
+        android:textSize="@dimen/txt_size_15sp"
+        app:layout_constraintEnd_toStartOf="@+id/keep_both_btn"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/keep_both_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_keep_both"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/more_details_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_more_details"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/keep_both_btn" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/cancel_keep_existing_btn"
+        style="@style/PositiveButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_cancel_keep_existing"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        android:lines="2"
+        android:gravity="center_vertical|end"
+        android:singleLine="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/more_details_btn" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conflict_resolve_consent_dialog.xml b/app/src/main/res/layout/conflict_resolve_consent_dialog.xml
new file mode 100644
index 000000000000..f0ac8de88111
--- /dev/null
+++ b/app/src/main/res/layout/conflict_resolve_consent_dialog.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/standard_padding">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/replace_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_replace"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/keep_both_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_keep_both"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/replace_btn" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/more_details_btn"
+        style="@style/NegativeButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_more_details"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/keep_both_btn" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/cancel_keep_existing_btn"
+        style="@style/PositiveButtonStyle"
+        android:layout_width="wrap_content"
+        android:lines="2"
+        android:gravity="center_vertical|end"
+        android:singleLine="false"
+        android:layout_height="wrap_content"
+        android:text="@string/conflict_cancel_keep_existing"
+        android:textAllCaps="false"
+        android:textSize="@dimen/txt_size_15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/more_details_btn" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/nmc_conflict_dialog.xml b/app/src/main/res/values-de/nmc_conflict_dialog.xml
new file mode 100644
index 000000000000..a919012dfb20
--- /dev/null
+++ b/app/src/main/res/values-de/nmc_conflict_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+
+<resources>
+    <string name="conflict_replace">Ersetzen</string>
+    <string name="conflict_replace_all">Alle ersetzen</string>
+    <string name="conflict_keep_both">Beide behalten</string>
+    <string name="conflict_keep_both_all">Beide Versionen für alle behalten</string>
+    <string name="conflict_more_details">Mehr Details</string>
+    <string name="conflict_cancel_keep_existing">Abbrechen und bestehende Datei behalten</string>
+    <string name="conflict_dialog_title">Dateikonflikt</string>
+    <string name="conflict_dialog_title_multiple">%d Dateikonflikte</string>
+    <string name="conflict_dialog_message">%1$s ist im Zielordner bereits vorhanden. Möchten Sie die bestehende Datei behalten oder überschreiben?</string>
+    <string name="conflict_dialog_message_multiple">Die Dateien sind im Zielordner bereits vorhanden. Möchten Sie die bestehenden Dateien behalten oder überschreiben?</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e9c749b86943..76e4e05ca495 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -36,4 +36,68 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9a721eb3e385..248aa18d524c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -76,4 +76,93 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_disabled">@color/grey_10</color>
+    <color name="switch_track_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000000..cc9e25255a10
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="grid_recyclerview_padding">4dp</dimen>
+    <dimen name="list_item_icons_size">16dp</dimen>
+    <dimen name="grid_item_icons_size">24dp</dimen>
+    <dimen name="media_grid_item_rv_spacing">6dp</dimen>
+    <dimen name="txt_size_18sp">18sp</dimen>
+    <dimen name="txt_size_15sp">15sp</dimen>
+    <dimen name="crop_corner_size">15dp</dimen>
+    <dimen name="edit_scan_bottom_bar_height">56dp</dimen>
+    <dimen name="standard_folders_grid_item_size">86dp</dimen>
+    <dimen name="standard_files_grid_item_size">80dp</dimen>
+    <dimen name="txt_size_11sp">11sp</dimen>
+    <dimen name="share_row_icon_size">30dp</dimen>
+    <dimen name="create_link_button_height">55dp</dimen>
+    <dimen name="note_et_height">258dp</dimen>
+    <dimen name="txt_size_17sp">17sp</dimen>
+    <dimen name="share_exp_date_divider_margin">20dp</dimen>
+    <dimen name="privacy_btn_width">160dp</dimen>
+    <dimen name="privacy_icon_size">50dp</dimen>
+    <dimen name="login_btn_width">150dp</dimen>
+    <dimen name="login_btn_height">55dp</dimen>
+    <dimen name="login_btn_bottom_margin">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_land">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
+    <dimen name="shared_with_me_icon_size">26dp</dimen>
+    <dimen name="txt_size_20sp">20sp</dimen>
+    <dimen name="notification_row_item_height">145dp</dimen>
+    <dimen name="button_stroke_width">1dp</dimen>
+    <dimen name="txt_size_13sp">13sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/nmc_conflict_dialog.xml b/app/src/main/res/values/nmc_conflict_dialog.xml
new file mode 100644
index 000000000000..78c8e470dd17
--- /dev/null
+++ b/app/src/main/res/values/nmc_conflict_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+
+<resources>
+    <string name="conflict_replace">Replace</string>
+    <string name="conflict_replace_all">Replace all</string>
+    <string name="conflict_keep_both">Keep both</string>
+    <string name="conflict_keep_both_all">Keep both for all</string>
+    <string name="conflict_more_details">More details</string>
+    <string name="conflict_cancel_keep_existing">Cancel and keep existing</string>
+    <string name="conflict_dialog_title">File conflict</string>
+    <string name="conflict_dialog_title_multiple">%d File conflicts</string>
+    <string name="conflict_dialog_message">%1$s already exists in this location. Do you want to replace it with the
+        file you are moving?</string>
+    <string name="conflict_dialog_message_multiple">The files already exist in this location. Do you want to replace them with the files you are moving?</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1a8b501ee4b7..402a9f77a167 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -432,6 +432,19 @@
         <item name="android:background">?android:attr/colorBackground</item>
     </style>
 
+    <!-- NMC Customization -->
+    <style name="PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/dialog_positive_btn_color</item>
+    </style>
+
+    <style name="NegativeButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/alert_txt_color</item>
+    </style>
+
+    <style name="NeutralButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/alert_txt_color</item>
+    </style>
+
     <style name="PreferenceTheme" parent="FallbackThemingTheme">
         <item name="android:colorBackground">@color/bg_default</item>
         <item name="android:listDivider">@null</item>