fix

packages/app/src/components/PageStatusAlert.jsx

@@ -58,14 +58,16 @@ class PageStatusAlert extends React.Component {
         <i className="icon-fw icon-pencil"></i>
         {t('modal_resolve_conflict.file_conflicting_with_newer_remote')}
       </>,
-      <button type="button" onClick={() => { }} className="btn btn-outline-white mr-4">
-        <i className="icon-fw icon-reload mr-1"></i>
-        Reload
-      </button>,
-      <button type="button" onClick={() => pageContainer.setState({ isConflictDiffModalOpen: true })} className="btn btn-outline-white">
-        <i className="fa fa-fw fa-file-text-o mr-1"></i>
-        {t('modal_resolve_conflict.resolve_conflict')}
-      </button>,
+      <>
+        <button type="button" onClick={() => { }} className="btn btn-outline-white mr-4">
+          <i className="icon-fw icon-reload mr-1"></i>
+          Reload
+        </button>
+        <button type="button" onClick={() => pageContainer.setState({ isConflictDiffModalOpen: true })} className="btn btn-outline-white">
+          <i className="fa fa-fw fa-file-text-o mr-1"></i>
+          {t('modal_resolve_conflict.resolve_conflict')}
+        </button>
+      </>,
     ];
   }