Make the Resolve conflict button actually appear

If you got an edit conflict, the save dialog would
dead-end: there was no way for you to actually get to
the edit conflict resolution page because we were
hiding the resolve button.

Bug: 69150
Change-Id: Iaccb7d0ec25d8f15398e437d614184433c33e6eb

modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js

@@ -50,7 +50,7 @@ ve.ui.MWSaveDialog.static.actions = [
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
 		flags: 'safe',
-		modes: 'save'
+		modes: [ 'save', 'conflict' ]
 	},
 	{
 		action: 'review',
@@ -168,7 +168,7 @@ ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
 		case 'conflict':
 			this.actions
 				.setAbilities( { save: false } )
-				.setMode( 'save' );
+				.setMode( 'conflict' );
 			break;
 		case 'review':
 			this.setSize( 'large' );