diff --git a/git/fileviewgitplugin.cpp b/git/fileviewgitplugin.cpp
--- a/git/fileviewgitplugin.cpp
+++ b/git/fileviewgitplugin.cpp
@@ -311,7 +311,7 @@
                 ++versionedCount;
             }
             if (state == UnversionedVersion || state == LocallyModifiedUnstagedVersion ||
-                state == IgnoredVersion) {
+                state == IgnoredVersion || state == ConflictingVersion) {
                 ++addableCount;
             }
             if (state == LocallyModifiedVersion || state == LocallyModifiedUnstagedVersion ||