diff --git a/src/main/kotlin/app/git/StatusManager.kt b/src/main/kotlin/app/git/StatusManager.kt
index f0a511b..0913124 100644
--- a/src/main/kotlin/app/git/StatusManager.kt
+++ b/src/main/kotlin/app/git/StatusManager.kt
@@ -216,7 +216,7 @@ class StatusManager @Inject constructor(
     }
 
     suspend fun reset(git: Git, statusEntry: StatusEntry, staged: Boolean) = withContext(Dispatchers.IO) {
-        if (staged) {
+        if (staged || statusEntry.statusType == StatusType.CONFLICTING) {
             git
                 .reset()
                 .addPath(statusEntry.filePath)