modal fb fix

packages/app/src/components/PageEditor/Editor.jsx

@@ -374,7 +374,7 @@ class Editor extends AbstractEditor {
         <ConflictDiffModal
           isOpen={this.props.pageContainer.state.isConflictDiffModalOpen}
           onCancel={() => this.props.pageContainer.setState({ isConflictDiffModalOpen: false })}
-          onResolveConflict={() => { }}
+          onResolveConflict={() => {}}
         />
       </>
     );

packages/app/src/components/PageStatusAlert.jsx

@@ -58,7 +58,7 @@ 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">
+      <button type="button" onClick={() => { }} className="btn btn-outline-white mr-4">
         <i className="icon-fw icon-reload mr-1"></i>
         Reload
       </button>,