diff --git a/VisualEditor.php b/VisualEditor.php
index ab811b1212..668ab8840b 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -650,6 +650,7 @@ $wgResourceModules += array(
 			'mediawiki.action.history.diff',
 			'mediawiki.user',
 			'mediawiki.util',
+			'mediawiki.jqueryMsg',
 			'jquery.autoEllipsis',
 			'jquery.byteLimit',
 		),
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c24fe6ecdd..54700672f2 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -144,7 +144,7 @@
     "visualeditor-dialogbutton-transclusion-tooltip": "Transclusion",
     "visualeditor-diff-nochanges": "Could not start the review because your revision matches the latest version of this page.",
     "visualeditor-differror": "Error loading data from server: $1.",
-    "visualeditor-editconflict": "Your changes could not be saved because of an edit conflict. Would you like to resolve the conflict manually?",
+    "visualeditor-editconflict": "Your changes could not be saved because of an edit conflict. Would {{GENDER:|you}} like to resolve the conflict manually?",
     "visualeditor-editnotices-tool": "$1 {{PLURAL:$1|notice|notices}}",
     "visualeditor-editnotices-tooltip": "Edit notices",
     "visualeditor-editsummary": "Describe what you changed",