diff --git a/platform/diff-api/resources/messages/DiffBundle.properties b/platform/diff-api/resources/messages/DiffBundle.properties
index a762313866de..94b1020f03ab 100644
--- a/platform/diff-api/resources/messages/DiffBundle.properties
+++ b/platform/diff-api/resources/messages/DiffBundle.properties
@@ -61,8 +61,8 @@ merge.dialog.accept.change.command=Accept change
 merge.dialog.ignore.change.command=Ignore change
 merge.dialog.reset.change.command=Reset resolved change
 merge.dialog.resolve.conflict.command=Resolve conflict
-merge.dialog.apply.non.conflicted.changes.command=Apply non conflicted changes
-merge.dialog.ignore.all.changes=Apply non conflicted changes
+merge.dialog.apply.non.conflicted.changes.command=Apply non-conflicting changes
+merge.dialog.ignore.all.changes=Apply non-conflicting changes
 patch.dialog.copy.change.command=Copy to clipboard
 patch.dialog.copy.change.command.balloon=Copied to clipboard
 # suppress inspection "UnusedProperty": used by 3-party plugins