solve confict and temporary comment out to build

src/client/js/components/PageEditor/HandsontableModal.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import {
   Button, ButtonGroup,
   Collapse,
-  Modal, ModalHeader, ModalBody, ModalFooter,
+  Modal, /* ModalHeader, ModalBody, */ ModalFooter,
 } from 'reactstrap';
 
 import Handsontable from 'handsontable';
@@ -432,14 +432,6 @@ export default class HandsontableModal extends React.PureComponent {
     );
 
     return (
-<<<<<<< HEAD
-      <Modal isOpen={this.state.show} toggle={this.cancel} size="lg" className={dialogClassName}>
-        <ModalHeader toggle={this.cancel} close={buttons}>Edit Table</ModalHeader>
-        <ModalBody className="p-0 d-flex flex-column">
-          <div className="px-4 py-3 modal-navbar bg-light">
-            <Button className="mr-4 data-import-button" onClick={this.toggleDataImportArea}>
-              <span className="mr-3">Data Import</span><i className={this.state.isDataImportAreaExpanded ? 'fa fa-angle-up' : 'fa fa-angle-down'}></i>
-=======
       <Modal show={this.state.show} onHide={this.cancel} bsSize="large" dialogClassName={dialogClassName} keyboard={false}>
         <Modal.Header closeButton>
           { this.renderExpandOrContractButton() }
@@ -449,7 +441,6 @@ export default class HandsontableModal extends React.PureComponent {
           <div className="px-4 py-3 modal-navbar">
             <Button className="m-r-20 data-import-button" onClick={this.toggleDataImportArea}>
               Data Import<i className={this.state.isDataImportAreaExpanded ? 'fa fa-angle-up' : 'fa fa-angle-down'}></i>
->>>>>>> master
             </Button>
             <ButtonGroup>
               <Button onClick={() => { this.alignButtonHandler('l') }}><i className="ti-align-left"></i></Button>
@@ -476,7 +467,7 @@ export default class HandsontableModal extends React.PureComponent {
               afterColumnMove={this.afterColumnMoveHandler}
             />
           </div>
-        </ModalBody>
+        </Modal.Body>
         <ModalFooter className="grw-modal-footer">
           <Button color="danger" onClick={this.reset}>Reset</Button>
           <div className="ml-auto">