diff --git a/packages/terra-data-grid/src/DataGrid.jsx b/packages/terra-data-grid/src/DataGrid.jsx
index f77c71c8d87..330b796ae42 100644
--- a/packages/terra-data-grid/src/DataGrid.jsx
+++ b/packages/terra-data-grid/src/DataGrid.jsx
@@ -649,4 +649,4 @@ const DataGrid = injectIntl((props) => {
 DataGrid.propTypes = propTypes;
 DataGrid.defaultProps = defaultProps;
 
-export default forwardRef((props, ref) => <DataGrid {...props} focusFuncRef={ref} />);
\ No newline at end of file
+export default forwardRef((props, ref) => <DataGrid {...props} focusFuncRef={ref} />);
diff --git a/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx b/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx
index 4ea17bbd135..d0c4af2dd60 100644
--- a/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx
+++ b/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx
@@ -150,7 +150,7 @@ const ColumnResizeHandle = (props) => {
         setNavigationEnabled(false);
         // Lock focus into component
         resizeHandleRef.current.focus();
-        
+
         // set styles for keyboard
         setResizeHandleStyles(['resize-handle', 'resize-handle-selected']);
 
diff --git a/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx b/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx
index d88f605398b..efbfb1b686e 100644
--- a/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx
+++ b/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx
@@ -41,7 +41,7 @@ describe('ColumnResizeHandle', () => {
     expect(resizeHandle.props()['aria-valuenow']).toBe(null);
     expect(resizeHandle.props()['aria-valuemin']).toBe(null);
     expect(resizeHandle.props()['aria-valuemax']).toBe(null);
-    expect(wrapper.find('.resize-handle').props().role).toBe('divider');
+    expect(wrapper.find('.resize-handle').props().role).toBe(null);
 
     expect(wrapper).toMatchSnapshot();
   });
@@ -152,7 +152,7 @@ describe('ColumnResizeHandle', () => {
 
     expect(wrapper.find('.resize-handle').props()['aria-label']).toBe(null);
     expect(wrapper.find('.resize-handle').props()['aria-valuetext']).toBe(null);
-    expect(wrapper.find('.resize-handle').props().role).toBe('divider');
+    expect(wrapper.find('.resize-handle').props().role).toBe(null);
   });
 
   it('increases column width with right arrow', () => {
diff --git a/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx b/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx
index fbd232778a5..e97a342cab1 100644
--- a/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx
+++ b/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx
@@ -55,11 +55,7 @@ describe('FlowsheetDataGrid', () => {
       />,
     );
 
-<<<<<<< HEAD
     const dataGrid = wrapper.find('ForwardRef');
-=======
-    const dataGrid = wrapper.find('#test-terra-flowsheet-data-grid');
->>>>>>> c4b58f1ad (fixed jest tests)
     const pinnedColumns = dataGrid.prop('pinnedColumns');
     expect(pinnedColumns).toEqual(
       [
diff --git a/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap b/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap
index 7060f5790f5..e1033e7e0d4 100644
--- a/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap
+++ b/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap
@@ -521,11 +521,7 @@ exports[`ColumnHeaderCell renders a pinned column header cell 1`] = `
             onMouseEnter={[Function]}
             onMouseLeave={[Function]}
             onMouseUp={[Function]}
-<<<<<<< HEAD
-            role="divider"
-=======
             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
             style={
               Object {
                 "height": "undefinedpx",
diff --git a/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap b/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap
index f322382d24a..6cd09891fe8 100644
--- a/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap
+++ b/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap
@@ -282,7 +282,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
       ]
     }
   >
-<<<<<<< HEAD
     <Component
       columnHeaderHeight="2.5rem"
       defaultColumnWidth={200}
@@ -326,30 +325,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                 "isShiftPressed": undefined,
                 "rowId": "1",
                 "rowIndex": 1,
-=======
-    <div
-      className="data-grid-container"
-    >
-      <table
-        className="data-grid"
-        id="test-terra-data-grid"
-        onFocus={[Function]}
-        onKeyDown={[Function]}
-        onMouseDown={[Function]}
-        role="grid"
-        tabIndex={0}
-      >
-        <Memo(ColumnHeader)
-          activeColumnResizing={false}
-          columns={
-            Array [
-              Object {
-                "displayName": " Vitals",
-                "id": "Column-0",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
->>>>>>> f0c547b77 (Copy the Jest updates)
               },
             ],
           ],
@@ -389,7 +364,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
           Object {
             "cells": Array [
               Object {
-<<<<<<< HEAD
                 "content": "Heart Rate Monitored (bpm)",
                 "isSelectable": false,
               },
@@ -464,6 +438,7 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
           tabIndex={0}
         >
           <Memo(ColumnHeader)
+            activeColumnResizing={false}
             columns={
               Array [
                 Object {
@@ -492,6 +467,7 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
             }
             headerHeight="2.5rem"
             onColumnSelect={[Function]}
+            onResizeHandleChange={[Function]}
             onResizeMouseDown={[Function]}
             tableHeight={0}
           >
@@ -499,101 +475,17 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
               <tr
                 className="column-header-row"
                 height="2.5rem"
-=======
-                "displayName": "March 16",
-                "id": "Column-1",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-              Object {
-                "displayName": "March 17",
-                "id": "Column-2",
-                "isSelectable": false,
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-            ]
-          }
-          headerHeight="2.5rem"
-          onColumnSelect={[Function]}
-          onResizeHandleChange={[Function]}
-          onResizeMouseDown={[Function]}
-          tableHeight={0}
-        >
-          <thead>
-            <tr
-              className="column-header-row"
-              height="2.5rem"
-            >
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={0}
-                displayName=" Vitals"
-                headerHeight="2.5rem"
-                id="Column-0"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-0"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
               >
                 <InjectIntl(ColumnHeaderCell)
                   columnIndex={0}
                   displayName=" Vitals"
                   headerHeight="2.5rem"
                   id="Column-0"
-<<<<<<< HEAD
-                  key="Column-0"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-0"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -634,11 +526,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -660,7 +555,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -670,77 +564,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                         Vitals
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={0}
-                      columnText=" Vitals"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={0}
-                        columnResizeIncrement={10}
                         columnText=" Vitals"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
-                        height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={0}
+                          columnResizeIncrement={10}
                           columnText=" Vitals"
                           columnWidth={200}
                           height={0}
@@ -771,35 +609,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label=" Vitals"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -813,104 +648,15 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={1}
-                displayName="March 16"
-                headerHeight="2.5rem"
-                id="Column-1"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-1"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={1}
                   displayName="March 16"
                   headerHeight="2.5rem"
                   id="Column-1"
-<<<<<<< HEAD
-                  key="Column-1"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-1"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -951,11 +697,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -977,7 +726,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -987,77 +735,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 16
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={1}
-                      columnText="March 16"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
-                        columnResizeIncrement={10}
                         columnText="March 16"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
-                        height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={1}
+                          columnResizeIncrement={10}
                           columnText="March 16"
                           columnWidth={200}
                           height={0}
@@ -1088,35 +780,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 16"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -1139,115 +828,16 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                    <div
-                      className="pinned-columns-divider"
-                      style={
-                        Object {
-                          "height": 0,
-                          "left": 199,
-                        }
-                      }
-                    />
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={2}
-                displayName="March 17"
-                headerHeight="2.5rem"
-                id="Column-2"
-                isActive={false}
-                isResizeActive={false}
-                isSelectable={false}
-                key="Column-2"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={2}
                   displayName="March 17"
                   headerHeight="2.5rem"
                   id="Column-2"
-<<<<<<< HEAD
-                  isSelectable={false}
-                  key="Column-2"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
                   isSelectable={false}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-2"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -1255,7 +845,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   tableHeight={0}
                   width={200}
                 >
-<<<<<<< HEAD
                   <ColumnHeaderCell
                     columnIndex={2}
                     displayName="March 17"
@@ -1263,16 +852,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     headerHeight="2.5rem"
                     id="Column-2"
                     intl={
-=======
-                  <th
-                    className="column-header"
-                    key="Column-2"
-                    onKeyDown={[Function]}
-                    onMouseDown={[Function]}
-                    role="columnheader"
-                    scope="col"
-                    style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                       Object {
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
@@ -1299,11 +878,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={false}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -1312,6 +894,8 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     <th
                       className="column-header"
                       key="Column-2"
+                      onKeyDown={[Function]}
+                      onMouseDown={[Function]}
                       role="columnheader"
                       scope="col"
                       style={
@@ -1323,7 +907,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -1333,77 +916,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 17
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={2}
-                      columnText="March 17"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
-                        columnResizeIncrement={10}
                         columnText="March 17"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
                         height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={2}
+                          columnResizeIncrement={10}
                           columnText="March 17"
                           columnWidth={200}
                           height={0}
@@ -1434,35 +961,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 17"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -1494,90 +1018,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     "isMasked": true,
                   },
                 ]
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-            </tr>
-          </thead>
-        </Memo(ColumnHeader)>
-        <tbody>
-          <Row
-            cells={
-              Array [
-                Object {
-                  "content": "Heart Rate Monitored (bpm)",
-                  "isSelectable": false,
-                },
-                Object {
-                  "content": "",
-                },
-                Object {
-                  "content": "66",
-                  "isMasked": true,
-                },
-              ]
-            }
-            displayedColumns={
-              Array [
-                Object {
-                  "displayName": " Vitals",
-                  "id": "Column-0",
-                },
-                Object {
-                  "displayName": "March 16",
-                  "id": "Column-1",
-                },
-                Object {
-                  "displayName": "March 17",
-                  "id": "Column-2",
-                  "isSelectable": false,
-                },
-              ]
-            }
-            height="2.5rem"
-            id="1"
-            key="1"
-            onCellSelect={[Function]}
-            rowHeaderIndex={0}
-            rowIndex={1}
-          >
-            <tr
-              className="row"
-              onMouseEnter={null}
-              onMouseLeave={null}
-              style={
-                Object {
-                  "height": "2.5rem",
-                }
->>>>>>> f0c547b77 (Copy the Jest updates)
               }
               displayedColumns={
                 Array [
@@ -2881,7 +2321,17 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
         <VisuallyHiddenText
           aria-atomic="true"
           aria-live="polite"
-<<<<<<< HEAD
+          text={null}
+        >
+          <span
+            aria-atomic="true"
+            aria-live="polite"
+            className="visually-hidden-text"
+          />
+        </VisuallyHiddenText>
+        <VisuallyHiddenText
+          aria-atomic="true"
+          aria-live="polite"
           text={null}
         >
           <span
@@ -2894,25 +2344,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
     </Component>
   </InjectIntl(Component)>
 </ForwardRef>
-=======
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-      <VisuallyHiddenText
-        aria-atomic="true"
-        aria-live="polite"
-        text={null}
-      >
-        <span
-          aria-atomic="true"
-          aria-live="polite"
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-    </div>
-  </DataGrid>
-</InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
 `;
 
 exports[`DataGrid verifies onCellSelect callback is triggered when space is pressed on a non-selectable cell 1`] = `
@@ -3197,7 +2628,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
       ]
     }
   >
-<<<<<<< HEAD
     <Component
       columnHeaderHeight="2.5rem"
       defaultColumnWidth={200}
@@ -3241,30 +2671,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                 "isShiftPressed": undefined,
                 "rowId": "1",
                 "rowIndex": 1,
-=======
-    <div
-      className="data-grid-container"
-    >
-      <table
-        className="data-grid"
-        id="test-terra-data-grid"
-        onFocus={[Function]}
-        onKeyDown={[Function]}
-        onMouseDown={[Function]}
-        role="grid"
-        tabIndex={0}
-      >
-        <Memo(ColumnHeader)
-          activeColumnResizing={false}
-          columns={
-            Array [
-              Object {
-                "displayName": " Vitals",
-                "id": "Column-0",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
->>>>>>> f0c547b77 (Copy the Jest updates)
               },
             ],
           ],
@@ -3304,7 +2710,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
           Object {
             "cells": Array [
               Object {
-<<<<<<< HEAD
                 "content": "Heart Rate Monitored (bpm)",
                 "isSelectable": false,
               },
@@ -3379,6 +2784,7 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
           tabIndex={0}
         >
           <Memo(ColumnHeader)
+            activeColumnResizing={false}
             columns={
               Array [
                 Object {
@@ -3407,6 +2813,7 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
             }
             headerHeight="2.5rem"
             onColumnSelect={[Function]}
+            onResizeHandleChange={[Function]}
             onResizeMouseDown={[Function]}
             tableHeight={0}
           >
@@ -3414,101 +2821,17 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
               <tr
                 className="column-header-row"
                 height="2.5rem"
-=======
-                "displayName": "March 16",
-                "id": "Column-1",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-              Object {
-                "displayName": "March 17",
-                "id": "Column-2",
-                "isSelectable": false,
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-            ]
-          }
-          headerHeight="2.5rem"
-          onColumnSelect={[Function]}
-          onResizeHandleChange={[Function]}
-          onResizeMouseDown={[Function]}
-          tableHeight={0}
-        >
-          <thead>
-            <tr
-              className="column-header-row"
-              height="2.5rem"
-            >
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={0}
-                displayName=" Vitals"
-                headerHeight="2.5rem"
-                id="Column-0"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-0"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
               >
                 <InjectIntl(ColumnHeaderCell)
                   columnIndex={0}
                   displayName=" Vitals"
                   headerHeight="2.5rem"
                   id="Column-0"
-<<<<<<< HEAD
-                  key="Column-0"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-0"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -3549,11 +2872,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -3575,7 +2901,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -3585,77 +2910,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                         Vitals
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={0}
-                      columnText=" Vitals"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={0}
-                        columnResizeIncrement={10}
                         columnText=" Vitals"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
-                        height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={0}
+                          columnResizeIncrement={10}
                           columnText=" Vitals"
                           columnWidth={200}
                           height={0}
@@ -3686,35 +2955,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label=" Vitals"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -3728,104 +2994,15 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={1}
-                displayName="March 16"
-                headerHeight="2.5rem"
-                id="Column-1"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-1"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={1}
                   displayName="March 16"
                   headerHeight="2.5rem"
                   id="Column-1"
-<<<<<<< HEAD
-                  key="Column-1"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-1"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -3866,11 +3043,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -3892,7 +3072,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -3902,77 +3081,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 16
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={1}
-                      columnText="March 16"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
-                        columnResizeIncrement={10}
                         columnText="March 16"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
-                        height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={1}
+                          columnResizeIncrement={10}
                           columnText="March 16"
                           columnWidth={200}
                           height={0}
@@ -4003,35 +3126,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 16"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -4054,115 +3174,16 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                    <div
-                      className="pinned-columns-divider"
-                      style={
-                        Object {
-                          "height": 0,
-                          "left": 199,
-                        }
-                      }
-                    />
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={2}
-                displayName="March 17"
-                headerHeight="2.5rem"
-                id="Column-2"
-                isActive={false}
-                isResizeActive={false}
-                isSelectable={false}
-                key="Column-2"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={2}
                   displayName="March 17"
-                  headerHeight="2.5rem"
-                  id="Column-2"
-<<<<<<< HEAD
-                  isSelectable={false}
-                  key="Column-2"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
+                  headerHeight="2.5rem"
+                  id="Column-2"
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
                   isSelectable={false}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-2"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -4170,7 +3191,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                   tableHeight={0}
                   width={200}
                 >
-<<<<<<< HEAD
                   <ColumnHeaderCell
                     columnIndex={2}
                     displayName="March 17"
@@ -4178,16 +3198,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     headerHeight="2.5rem"
                     id="Column-2"
                     intl={
-=======
-                  <th
-                    className="column-header"
-                    key="Column-2"
-                    onKeyDown={[Function]}
-                    onMouseDown={[Function]}
-                    role="columnheader"
-                    scope="col"
-                    style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                       Object {
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
@@ -4214,11 +3224,14 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={false}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -4227,6 +3240,8 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     <th
                       className="column-header"
                       key="Column-2"
+                      onKeyDown={[Function]}
+                      onMouseDown={[Function]}
                       role="columnheader"
                       scope="col"
                       style={
@@ -4238,7 +3253,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -4248,77 +3262,21 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 17
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={2}
-                      columnText="March 17"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
-                        columnResizeIncrement={10}
                         columnText="March 17"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
                         height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={2}
+                          columnResizeIncrement={10}
                           columnText="March 17"
                           columnWidth={200}
                           height={0}
@@ -4349,35 +3307,32 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 17"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -4409,90 +3364,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
                     "isMasked": true,
                   },
                 ]
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-            </tr>
-          </thead>
-        </Memo(ColumnHeader)>
-        <tbody>
-          <Row
-            cells={
-              Array [
-                Object {
-                  "content": "Heart Rate Monitored (bpm)",
-                  "isSelectable": false,
-                },
-                Object {
-                  "content": "",
-                },
-                Object {
-                  "content": "66",
-                  "isMasked": true,
-                },
-              ]
-            }
-            displayedColumns={
-              Array [
-                Object {
-                  "displayName": " Vitals",
-                  "id": "Column-0",
-                },
-                Object {
-                  "displayName": "March 16",
-                  "id": "Column-1",
-                },
-                Object {
-                  "displayName": "March 17",
-                  "id": "Column-2",
-                  "isSelectable": false,
-                },
-              ]
-            }
-            height="2.5rem"
-            id="1"
-            key="1"
-            onCellSelect={[Function]}
-            rowHeaderIndex={0}
-            rowIndex={1}
-          >
-            <tr
-              className="row"
-              onMouseEnter={null}
-              onMouseLeave={null}
-              style={
-                Object {
-                  "height": "2.5rem",
-                }
->>>>>>> f0c547b77 (Copy the Jest updates)
               }
               displayedColumns={
                 Array [
@@ -5796,7 +4667,17 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
         <VisuallyHiddenText
           aria-atomic="true"
           aria-live="polite"
-<<<<<<< HEAD
+          text={null}
+        >
+          <span
+            aria-atomic="true"
+            aria-live="polite"
+            className="visually-hidden-text"
+          />
+        </VisuallyHiddenText>
+        <VisuallyHiddenText
+          aria-atomic="true"
+          aria-live="polite"
           text={null}
         >
           <span
@@ -5809,25 +4690,6 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres
     </Component>
   </InjectIntl(Component)>
 </ForwardRef>
-=======
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-      <VisuallyHiddenText
-        aria-atomic="true"
-        aria-live="polite"
-        text={null}
-      >
-        <span
-          aria-atomic="true"
-          aria-live="polite"
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-    </div>
-  </DataGrid>
-</InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
 `;
 
 exports[`DataGrid verifies row selection column header selection 1`] = `
@@ -6100,7 +4962,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
       ]
     }
   >
-<<<<<<< HEAD
     <Component
       columnHeaderHeight="2.5rem"
       defaultColumnWidth={200}
@@ -6137,24 +4998,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
       onColumnSelect={
         [MockFunction] {
           "calls": Array [
-=======
-    <div
-      className="data-grid-container"
-    >
-      <table
-        className="data-grid"
-        id="test-terra-data-grid"
-        onFocus={[Function]}
-        onKeyDown={[Function]}
-        onMouseDown={[Function]}
-        role="grid"
-        tabIndex={0}
-      >
-        <Memo(ColumnHeader)
-          activeColumnIndex={0}
-          activeColumnResizing={false}
-          columns={
->>>>>>> f0c547b77 (Copy the Jest updates)
             Array [
               "WorklistDataGrid-rowSelectionColumn",
             ],
@@ -6195,7 +5038,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
           Object {
             "cells": Array [
               Object {
-<<<<<<< HEAD
                 "content": "Heart Rate Monitored (bpm)",
                 "isSelectable": false,
               },
@@ -6270,6 +5112,8 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
           tabIndex={0}
         >
           <Memo(ColumnHeader)
+            activeColumnIndex={0}
+            activeColumnResizing={false}
             columns={
               Array [
                 Object {
@@ -6306,6 +5150,7 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
             }
             headerHeight="2.5rem"
             onColumnSelect={[Function]}
+            onResizeHandleChange={[Function]}
             onResizeMouseDown={[Function]}
             tableHeight={0}
           >
@@ -6313,119 +5158,18 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
               <tr
                 className="column-header-row"
                 height="2.5rem"
-=======
-                "id": "WorklistDataGrid-rowSelectionColumn",
-                "isResizable": false,
-                "isSelectable": true,
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 40,
-              },
-              Object {
-                "displayName": " Vitals",
-                "id": "Column-0",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-              Object {
-                "displayName": "March 16",
-                "id": "Column-1",
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-              Object {
-                "displayName": "March 17",
-                "id": "Column-2",
-                "isSelectable": false,
-                "maximumWidth": 300,
-                "minimumWidth": 60,
-                "width": 200,
-              },
-            ]
-          }
-          headerHeight="2.5rem"
-          onColumnSelect={[Function]}
-          onResizeHandleChange={[Function]}
-          onResizeMouseDown={[Function]}
-          tableHeight={0}
-        >
-          <thead>
-            <tr
-              className="column-header-row"
-              height="2.5rem"
-            >
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={0}
-                headerHeight="2.5rem"
-                id="WorklistDataGrid-rowSelectionColumn"
-                isActive={true}
-                isResizable={false}
-                isResizeActive={false}
-                isSelectable={true}
-                key="WorklistDataGrid-rowSelectionColumn"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
               >
                 <InjectIntl(ColumnHeaderCell)
                   columnIndex={0}
                   headerHeight="2.5rem"
                   id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={true}
->>>>>>> f0c547b77 (Copy the Jest updates)
                   isResizable={false}
                   isResizeActive={false}
                   isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                   key="WorklistDataGrid-rowSelectionColumn"
                   maximumWidth={300}
                   minimumWidth={60}
-=======
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                  maximumWidth={300}
-                  minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -6465,11 +5209,14 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         "timeZone": null,
                       }
                     }
+                    isActive={true}
                     isResizable={false}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -6491,7 +5238,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                       >
@@ -6501,79 +5247,15 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                      <span />
-                    </div>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={1}
-                displayName=" Vitals"
-                headerHeight="2.5rem"
-                id="Column-0"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-0"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={1}
                   displayName=" Vitals"
                   headerHeight="2.5rem"
                   id="Column-0"
-<<<<<<< HEAD
-                  key="Column-0"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-0"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -6614,11 +5296,14 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -6640,7 +5325,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -6650,77 +5334,21 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                         Vitals
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={1}
-                      columnText=" Vitals"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
-                        columnResizeIncrement={10}
                         columnText=" Vitals"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
                         height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={1}
+                          columnResizeIncrement={10}
                           columnText=" Vitals"
                           columnWidth={200}
                           height={0}
@@ -6751,35 +5379,32 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label=" Vitals"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -6793,104 +5418,15 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={2}
-                displayName="March 16"
-                headerHeight="2.5rem"
-                id="Column-1"
-                isActive={false}
-                isResizeActive={false}
-                key="Column-1"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={2}
                   displayName="March 16"
                   headerHeight="2.5rem"
                   id="Column-1"
-<<<<<<< HEAD
-                  key="Column-1"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
-                  isSelectable={true}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-1"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -6931,11 +5467,14 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={true}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -6957,7 +5496,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -6967,77 +5505,21 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 16
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={2}
-                      columnText="March 16"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
-                        columnResizeIncrement={10}
                         columnText="March 16"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        height={0}
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-=======
                         height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
                         onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         onResizeMouseDown={[Function]}
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
                       >
-<<<<<<< HEAD
                         <ColumnResizeHandle
                           columnIndex={2}
+                          columnResizeIncrement={10}
                           columnText="March 16"
                           columnWidth={200}
                           height={0}
@@ -7068,35 +5550,32 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 16"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -7119,115 +5598,16 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                   </ColumnHeaderCell>
                 </InjectIntl(ColumnHeaderCell)>
                 <InjectIntl(ColumnHeaderCell)
-=======
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
-                          tabIndex={-1}
-                        />
-                      </ColumnResizeHandle>
-                    </InjectIntl(ColumnResizeHandle)>
-                    <div
-                      className="pinned-columns-divider"
-                      style={
-                        Object {
-                          "height": 0,
-                          "left": 199,
-                        }
-                      }
-                    />
-                  </th>
-                </ColumnHeaderCell>
-              </InjectIntl(ColumnHeaderCell)>
-              <InjectIntl(ColumnHeaderCell)
-                columnIndex={3}
-                displayName="March 17"
-                headerHeight="2.5rem"
-                id="Column-2"
-                isActive={false}
-                isResizeActive={false}
-                isSelectable={false}
-                key="Column-2"
-                maximumWidth={300}
-                minimumWidth={60}
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                rowIndex={0}
-                tableHeight={0}
-                width={200}
-              >
-                <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                   columnIndex={3}
                   displayName="March 17"
                   headerHeight="2.5rem"
                   id="Column-2"
-<<<<<<< HEAD
-                  isSelectable={false}
-                  key="Column-2"
-                  maximumWidth={300}
-                  minimumWidth={60}
-=======
-                  intl={
-                    Object {
-                      "defaultFormats": Object {},
-                      "defaultLocale": "en",
-                      "formatDate": [Function],
-                      "formatHTMLMessage": [Function],
-                      "formatMessage": [Function],
-                      "formatNumber": [Function],
-                      "formatPlural": [Function],
-                      "formatRelative": [Function],
-                      "formatTime": [Function],
-                      "formats": Object {},
-                      "formatters": Object {
-                        "getDateTimeFormat": [Function],
-                        "getMessageFormat": [Function],
-                        "getNumberFormat": [Function],
-                        "getPluralFormat": [Function],
-                        "getRelativeFormat": [Function],
-                      },
-                      "locale": "en",
-                      "messages": null,
-                      "now": [Function],
-                      "onError": [Function],
-                      "textComponent": "span",
-                      "timeZone": null,
-                    }
-                  }
                   isActive={false}
-                  isResizable={true}
                   isResizeActive={false}
                   isSelectable={false}
-<<<<<<< HEAD
-                  maximumWidth={500}
-                  minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                  key="Column-2"
                   maximumWidth={300}
                   minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                   onColumnSelect={[Function]}
                   onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
@@ -7235,7 +5615,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                   tableHeight={0}
                   width={200}
                 >
-<<<<<<< HEAD
                   <ColumnHeaderCell
                     columnIndex={3}
                     displayName="March 17"
@@ -7243,16 +5622,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                     headerHeight="2.5rem"
                     id="Column-2"
                     intl={
-=======
-                  <th
-                    className="column-header"
-                    key="Column-2"
-                    onKeyDown={[Function]}
-                    onMouseDown={[Function]}
-                    role="columnheader"
-                    scope="col"
-                    style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                       Object {
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
@@ -7279,11 +5648,14 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         "timeZone": null,
                       }
                     }
+                    isActive={false}
                     isResizable={true}
+                    isResizeActive={false}
                     isSelectable={false}
                     maximumWidth={300}
                     minimumWidth={60}
                     onColumnSelect={[Function]}
+                    onResizeHandleChange={[Function]}
                     onResizeMouseDown={[Function]}
                     rowIndex={0}
                     tableHeight={0}
@@ -7292,6 +5664,8 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                     <th
                       className="column-header"
                       key="Column-2"
+                      onKeyDown={[Function]}
+                      onMouseDown={[Function]}
                       role="columnheader"
                       scope="col"
                       style={
@@ -7303,7 +5677,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                       }
                       tabIndex={-1}
                     >
-<<<<<<< HEAD
                       <div
                         className="header-container"
                         role="button"
@@ -7313,43 +5686,21 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                         </span>
                       </div>
                       <InjectIntl(ColumnResizeHandle)
-=======
-                      <span>
-                        March 17
-                      </span>
-                    </div>
-                    <InjectIntl(ColumnResizeHandle)
-                      columnIndex={3}
-                      columnText="March 17"
-                      columnWidth={200}
-                      height={0}
-                      isActive={false}
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      onResizeMouseUp={[Function]}
-                    >
-                      <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
-                        columnResizeIncrement={10}
                         columnText="March 17"
                         columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         height={0}
+                        isActive={false}
                         maximumWidth={300}
                         minimumWidth={60}
+                        onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                         onResizeMouseUp={[Function]}
                         setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                       >
                         <ColumnResizeHandle
                           columnIndex={3}
+                          columnResizeIncrement={10}
                           columnText="March 17"
                           columnWidth={200}
                           height={0}
@@ -7380,35 +5731,32 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           maximumWidth={300}
                           minimumWidth={60}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                           onResizeMouseUp={[Function]}
                           setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                         >
                           <div
                             aria-hidden={true}
-                            aria-label="March 17"
-                            aria-valuemax={300}
-                            aria-valuemin={60}
-                            aria-valuenow={200}
-                            aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                            aria-label={null}
+                            aria-valuemax={null}
+                            aria-valuemin={null}
+                            aria-valuenow={null}
+                            aria-valuetext={null}
                             className="resize-handle"
                             draggable={true}
                             onBlur={[Function]}
+                            onClick={[Function]}
                             onFocus={[Function]}
+                            onKeyDown={[Function]}
                             onMouseDown={[Function]}
-<<<<<<< HEAD
-                            role="slider"
-=======
                             onMouseEnter={[Function]}
                             onMouseLeave={[Function]}
                             onMouseUp={[Function]}
                             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                             style={
                               Object {
                                 "height": "0px",
@@ -7537,11 +5885,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                       <Cell
                         columnId="WorklistDataGrid-rowSelectionColumn"
                         columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         intl={
                           Object {
                             "defaultFormats": Object {},
@@ -7569,7 +5912,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                             "timeZone": null,
                           }
                         }
-<<<<<<< HEAD
                         isMasked={false}
                         isRowHeader={false}
                         isSelectable={true}
@@ -7588,42 +5930,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
                               "left": 0,
                             }
                           }
-=======
-                        isActive={false}
-                        maximumWidth={300}
-                        minimumWidth={60}
-                        onResizeHandleChange={[Function]}
-                        onResizeMouseDown={[Function]}
-                        onResizeMouseUp={[Function]}
-                      >
-                        <div
-                          aria-hidden={true}
-                          aria-label={null}
-                          aria-valuemax={null}
-                          aria-valuemin={null}
-                          aria-valuenow={null}
-                          aria-valuetext={null}
-                          className="resize-handle"
-                          draggable={true}
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseEnter={[Function]}
-                          onMouseLeave={[Function]}
-                          onMouseUp={[Function]}
-<<<<<<< HEAD
-                          role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                          role="divider"
-                          style={
-                            Object {
-                              "height": "0px",
-                            }
-                          }
->>>>>>> d5c6ea0e7 (updated snapshots)
                           tabIndex={-1}
                         >
                           <FocusTrap
@@ -9377,7 +7683,17 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
         <VisuallyHiddenText
           aria-atomic="true"
           aria-live="polite"
-<<<<<<< HEAD
+          text={null}
+        >
+          <span
+            aria-atomic="true"
+            aria-live="polite"
+            className="visually-hidden-text"
+          />
+        </VisuallyHiddenText>
+        <VisuallyHiddenText
+          aria-atomic="true"
+          aria-live="polite"
           text={null}
         >
           <span
@@ -9390,25 +7706,6 @@ exports[`DataGrid verifies row selection column header selection 1`] = `
     </Component>
   </InjectIntl(Component)>
 </ForwardRef>
-=======
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-      <VisuallyHiddenText
-        aria-atomic="true"
-        aria-live="polite"
-        text={null}
-      >
-        <span
-          aria-atomic="true"
-          aria-live="polite"
-          className="visually-hidden-text"
-        />
-      </VisuallyHiddenText>
-    </div>
-  </DataGrid>
-</InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
 `;
 
 exports[`DataGrid verifies that the grid created is consistent with the rows and overflowColumns props 1`] = `
diff --git a/packages/terra-data-grid/tests/jest/__snapshots__/WorklistDataGrid.test.jsx.snap b/packages/terra-data-grid/tests/jest/__snapshots__/WorklistDataGrid.test.jsx.snap
index c15d44ea526..2caa9f5aa0a 100644
--- a/packages/terra-data-grid/tests/jest/__snapshots__/WorklistDataGrid.test.jsx.snap
+++ b/packages/terra-data-grid/tests/jest/__snapshots__/WorklistDataGrid.test.jsx.snap
@@ -512,7 +512,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -657,6 +656,7 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -685,6 +685,7 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -692,125 +693,17 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -851,11 +744,14 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -877,7 +773,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -887,77 +782,21 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={0}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={0}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={0}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -988,35 +827,32 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -1030,104 +866,15 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -1168,11 +915,14 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -1194,7 +944,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -1204,77 +953,21 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -1305,35 +998,32 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -1356,115 +1046,16 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -1472,7 +1063,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={2}
                           displayName="March 17"
@@ -1480,16 +1070,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -1516,11 +1096,14 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -1529,6 +1112,8 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -1540,7 +1125,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -1550,77 +1134,21 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -1651,35 +1179,32 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -1711,90 +1236,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
                           "isMasked": true,
                         },
                       ]
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                  </tr>
-                </thead>
-              </Memo(ColumnHeader)>
-              <tbody>
-                <Row
-                  cells={
-                    Array [
-                      Object {
-                        "content": "Heart Rate Monitored (bpm)",
-                        "isSelectable": false,
-                      },
-                      Object {
-                        "content": "",
-                      },
-                      Object {
-                        "content": "66",
-                        "isMasked": true,
-                      },
-                    ]
-                  }
-                  displayedColumns={
-                    Array [
-                      Object {
-                        "displayName": " Vitals",
-                        "id": "Column-0",
-                      },
-                      Object {
-                        "displayName": "March 16",
-                        "id": "Column-1",
-                      },
-                      Object {
-                        "displayName": "March 17",
-                        "id": "Column-2",
-                        "isSelectable": false,
-                      },
-                    ]
-                  }
-                  height="2.5rem"
-                  id="1"
-                  key="1"
-                  onCellSelect={[Function]}
-                  rowHeaderIndex={0}
-                  rowIndex={1}
-                >
-                  <tr
-                    className="row"
-                    onMouseEnter={null}
-                    onMouseLeave={null}
-                    style={
-                      Object {
-                        "height": "2.5rem",
-                      }
->>>>>>> f0c547b77 (Copy the Jest updates)
                     }
                     displayedColumns={
                       Array [
@@ -3098,7 +2539,17 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -3111,25 +2562,6 @@ exports[`Row selection verifies Shift+Click enables row selection when row selec
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -3687,7 +3119,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -3833,6 +3264,7 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -3869,6 +3301,7 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -3876,136 +3309,18 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -4045,11 +3360,14 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -4071,7 +3389,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -4081,79 +3398,15 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -4194,11 +3447,14 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -4220,7 +3476,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -4230,77 +3485,21 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -4331,35 +3530,32 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -4373,104 +3569,15 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -4511,11 +3618,14 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -4537,7 +3647,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -4547,77 +3656,21 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -4648,35 +3701,32 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -4699,115 +3749,16 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -4815,7 +3766,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -4823,16 +3773,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -4859,11 +3799,14 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -4872,6 +3815,8 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -4883,7 +3828,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -4893,43 +3837,21 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -4960,35 +3882,32 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -5117,11 +4036,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -5149,7 +4063,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -5168,42 +4081,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -6957,7 +5834,17 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -6970,25 +5857,6 @@ exports[`Row selection verifies Shift+Click establishes anchor and selects row w
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -7546,7 +6414,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -7692,6 +6559,7 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -7728,6 +6596,7 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -7735,136 +6604,18 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -7904,11 +6655,14 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -7930,7 +6684,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -7940,79 +6693,15 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -8053,11 +6742,14 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -8079,7 +6771,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -8089,77 +6780,21 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -8190,35 +6825,32 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -8232,104 +6864,15 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -8370,11 +6913,14 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -8396,7 +6942,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -8406,77 +6951,21 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -8507,35 +6996,32 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -8558,115 +7044,16 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -8674,7 +7061,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -8682,16 +7068,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -8718,11 +7094,14 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -8731,6 +7110,8 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -8742,7 +7123,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -8752,43 +7132,21 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -8819,35 +7177,32 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -8976,11 +7331,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -9008,7 +7358,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -9027,42 +7376,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -10816,7 +9129,17 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -10829,25 +9152,6 @@ exports[`Row selection verifies Shift+Click honors the anchor established by row
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -11385,7 +9689,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -11530,6 +9833,7 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -11558,6 +9862,7 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -11565,125 +9870,17 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -11724,11 +9921,14 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -11750,7 +9950,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -11760,77 +9959,21 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={0}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={0}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={0}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -11861,35 +10004,32 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -11903,104 +10043,15 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -12041,11 +10092,14 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -12067,7 +10121,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -12077,77 +10130,21 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -12178,35 +10175,32 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -12229,115 +10223,16 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -12345,7 +10240,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={2}
                           displayName="March 17"
@@ -12353,16 +10247,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -12389,11 +10273,14 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -12402,6 +10289,8 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -12413,7 +10302,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -12423,77 +10311,21 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -12524,35 +10356,32 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -12584,90 +10413,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
                           "isMasked": true,
                         },
                       ]
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                  </tr>
-                </thead>
-              </Memo(ColumnHeader)>
-              <tbody>
-                <Row
-                  cells={
-                    Array [
-                      Object {
-                        "content": "Heart Rate Monitored (bpm)",
-                        "isSelectable": false,
-                      },
-                      Object {
-                        "content": "",
-                      },
-                      Object {
-                        "content": "66",
-                        "isMasked": true,
-                      },
-                    ]
-                  }
-                  displayedColumns={
-                    Array [
-                      Object {
-                        "displayName": " Vitals",
-                        "id": "Column-0",
-                      },
-                      Object {
-                        "displayName": "March 16",
-                        "id": "Column-1",
-                      },
-                      Object {
-                        "displayName": "March 17",
-                        "id": "Column-2",
-                        "isSelectable": false,
-                      },
-                    ]
-                  }
-                  height="2.5rem"
-                  id="1"
-                  key="1"
-                  onCellSelect={[Function]}
-                  rowHeaderIndex={0}
-                  rowIndex={1}
-                >
-                  <tr
-                    className="row"
-                    onMouseEnter={null}
-                    onMouseLeave={null}
-                    style={
-                      Object {
-                        "height": "2.5rem",
-                      }
->>>>>>> f0c547b77 (Copy the Jest updates)
                     }
                     displayedColumns={
                       Array [
@@ -13971,7 +11716,17 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -13984,25 +11739,6 @@ exports[`Row selection verifies Shift+Space enables row selection when row selec
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -14560,7 +12296,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -14706,6 +12441,7 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -14742,6 +12478,7 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -14749,136 +12486,18 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -14918,11 +12537,14 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -14944,7 +12566,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -14954,79 +12575,15 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -15067,11 +12624,14 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -15093,7 +12653,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -15103,77 +12662,21 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -15204,35 +12707,32 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -15246,104 +12746,15 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -15384,11 +12795,14 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -15410,7 +12824,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -15420,77 +12833,21 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -15521,35 +12878,32 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -15572,115 +12926,16 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -15688,7 +12943,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -15696,16 +12950,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -15732,11 +12976,14 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -15745,6 +12992,8 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -15756,7 +13005,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -15766,43 +13014,21 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -15833,35 +13059,32 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -15990,11 +13213,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -16022,7 +13240,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -16041,42 +13258,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -17830,7 +15011,17 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -17843,25 +15034,6 @@ exports[`Row selection verifies Shift+Space establishes anchor and selects row i
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -18419,7 +15591,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -18565,6 +15736,7 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -18601,6 +15773,7 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -18608,136 +15781,18 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -18777,11 +15832,14 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -18803,7 +15861,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -18813,79 +15870,15 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -18926,11 +15919,14 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -18952,7 +15948,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -18962,78 +15957,193 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
+                              onResizeHandleChange={[Function]}
+                              onResizeMouseDown={[Function]}
+                              onResizeMouseUp={[Function]}
+                              setIsActive={[Function]}
+                            >
+                              <ColumnResizeHandle
+                                columnIndex={1}
+                                columnResizeIncrement={10}
+                                columnText=" Vitals"
+                                columnWidth={200}
+                                height={0}
+                                intl={
+                                  Object {
+                                    "defaultFormats": Object {},
+                                    "defaultLocale": "en",
+                                    "formatDate": [Function],
+                                    "formatHTMLMessage": [Function],
+                                    "formatMessage": [Function],
+                                    "formatNumber": [Function],
+                                    "formatPlural": [Function],
+                                    "formatRelative": [Function],
+                                    "formatTime": [Function],
+                                    "formats": Object {},
+                                    "formatters": Object {
+                                      "getDateTimeFormat": [Function],
+                                      "getMessageFormat": [Function],
+                                      "getNumberFormat": [Function],
+                                      "getPluralFormat": [Function],
+                                      "getRelativeFormat": [Function],
+                                    },
+                                    "locale": "en",
+                                    "messages": null,
+                                    "now": [Function],
+                                    "onError": [Function],
+                                    "textComponent": "span",
+                                    "timeZone": null,
+                                  }
                                 }
+                                isActive={false}
+                                maximumWidth={300}
+                                minimumWidth={60}
+                                onResizeHandleChange={[Function]}
+                                onResizeMouseDown={[Function]}
+                                onResizeMouseUp={[Function]}
+                                setIsActive={[Function]}
+                              >
+                                <div
+                                  aria-hidden={true}
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
+                                  className="resize-handle"
+                                  draggable={true}
+                                  onBlur={[Function]}
+                                  onClick={[Function]}
+                                  onFocus={[Function]}
+                                  onKeyDown={[Function]}
+                                  onMouseDown={[Function]}
+                                  onMouseEnter={[Function]}
+                                  onMouseLeave={[Function]}
+                                  onMouseUp={[Function]}
+                                  role={null}
+                                  style={
+                                    Object {
+                                      "height": "0px",
+                                    }
+                                  }
+                                  tabIndex={-1}
+                                />
+                              </ColumnResizeHandle>
+                            </InjectIntl(ColumnResizeHandle)>
+                          </th>
+                        </ColumnHeaderCell>
+                      </InjectIntl(ColumnHeaderCell)>
+                      <InjectIntl(ColumnHeaderCell)
+                        columnIndex={2}
+                        displayName="March 16"
+                        headerHeight="2.5rem"
+                        id="Column-1"
+                        isActive={false}
+                        isResizeActive={false}
+                        key="Column-1"
+                        maximumWidth={300}
+                        minimumWidth={60}
+                        onColumnSelect={[Function]}
+                        onResizeHandleChange={[Function]}
+                        onResizeMouseDown={[Function]}
+                        rowIndex={0}
+                        tableHeight={0}
+                        width={200}
+                      >
+                        <ColumnHeaderCell
+                          columnIndex={2}
+                          displayName="March 16"
+                          hasError={false}
+                          headerHeight="2.5rem"
+                          id="Column-1"
+                          intl={
+                            Object {
+                              "defaultFormats": Object {},
+                              "defaultLocale": "en",
+                              "formatDate": [Function],
+                              "formatHTMLMessage": [Function],
+                              "formatMessage": [Function],
+                              "formatNumber": [Function],
+                              "formatPlural": [Function],
+                              "formatRelative": [Function],
+                              "formatTime": [Function],
+                              "formats": Object {},
+                              "formatters": Object {
+                                "getDateTimeFormat": [Function],
+                                "getMessageFormat": [Function],
+                                "getNumberFormat": [Function],
+                                "getPluralFormat": [Function],
+                                "getRelativeFormat": [Function],
+                              },
+                              "locale": "en",
+                              "messages": null,
+                              "now": [Function],
+                              "onError": [Function],
+                              "textComponent": "span",
+                              "timeZone": null,
+                            }
+                          }
+                          isActive={false}
+                          isResizable={true}
+                          isResizeActive={false}
+                          isSelectable={true}
+                          maximumWidth={300}
+                          minimumWidth={60}
+                          onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
+                          onResizeMouseDown={[Function]}
+                          rowIndex={0}
+                          tableHeight={0}
+                          width={200}
+                        >
+                          <th
+                            className="column-header selectable pinned"
+                            key="Column-1"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
+                            role="columnheader"
+                            scope="col"
+                            style={
+                              Object {
+                                "height": "2.5rem",
+                                "left": 240,
+                                "width": "200px",
                               }
+                            }
+                            tabIndex={-1}
+                          >
+                            <div
+                              className="header-container"
+                              role="button"
+                            >
+                              <span>
+                                March 16
+                              </span>
+                            </div>
+                            <InjectIntl(ColumnResizeHandle)
+                              columnIndex={2}
+                              columnText="March 16"
+                              columnWidth={200}
+                              height={0}
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
-                                columnIndex={1}
-                                columnText=" Vitals"
+                                columnIndex={2}
+                                columnResizeIncrement={10}
+                                columnText="March 16"
                                 columnWidth={200}
                                 height={0}
                                 intl={
@@ -19063,352 +16173,32 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
-                                  style={
-                                    Object {
-                                      "height": "0px",
-                                    }
-                                  }
-                                  tabIndex={-1}
-                                />
-                              </ColumnResizeHandle>
-                            </InjectIntl(ColumnResizeHandle)>
-                          </th>
-                        </ColumnHeaderCell>
-                      </InjectIntl(ColumnHeaderCell)>
-                      <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
-                        columnIndex={2}
-                        displayName="March 16"
-                        headerHeight="2.5rem"
-                        id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
-                        isActive={false}
-                        isResizable={true}
-                        isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                        onColumnSelect={[Function]}
-                        onResizeHandleChange={[Function]}
-                        onResizeMouseDown={[Function]}
-                        rowIndex={0}
-                        tableHeight={0}
-                        width={200}
-                      >
-                        <ColumnHeaderCell
-                          columnIndex={2}
-                          displayName="March 16"
-                          hasError={false}
-                          headerHeight="2.5rem"
-                          id="Column-1"
-                          intl={
-                            Object {
-                              "defaultFormats": Object {},
-                              "defaultLocale": "en",
-                              "formatDate": [Function],
-                              "formatHTMLMessage": [Function],
-                              "formatMessage": [Function],
-                              "formatNumber": [Function],
-                              "formatPlural": [Function],
-                              "formatRelative": [Function],
-                              "formatTime": [Function],
-                              "formats": Object {},
-                              "formatters": Object {
-                                "getDateTimeFormat": [Function],
-                                "getMessageFormat": [Function],
-                                "getNumberFormat": [Function],
-                                "getPluralFormat": [Function],
-                                "getRelativeFormat": [Function],
-                              },
-                              "locale": "en",
-                              "messages": null,
-                              "now": [Function],
-                              "onError": [Function],
-                              "textComponent": "span",
-                              "timeZone": null,
-                            }
-                          }
-                          isResizable={true}
-                          isSelectable={true}
-                          maximumWidth={300}
-                          minimumWidth={60}
-                          onColumnSelect={[Function]}
-                          onResizeMouseDown={[Function]}
-                          rowIndex={0}
-                          tableHeight={0}
-                          width={200}
-                        >
-                          <th
-                            className="column-header selectable pinned"
-                            key="Column-1"
-                            onKeyDown={[Function]}
-                            onMouseDown={[Function]}
-                            role="columnheader"
-                            scope="col"
-                            style={
-                              Object {
-                                "height": "2.5rem",
-                                "left": 240,
-                                "width": "200px",
-                              }
-                            }
-                            tabIndex={-1}
-                          >
-<<<<<<< HEAD
-                            <div
-                              className="header-container"
-                              role="button"
-                            >
-                              <span>
-                                March 16
-                              </span>
-                            </div>
-                            <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
-                              columnIndex={2}
-                              columnResizeIncrement={10}
-                              columnText="March 16"
-                              columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                              setIsActive={[Function]}
-                            >
-<<<<<<< HEAD
-                              <ColumnResizeHandle
-                                columnIndex={2}
-                                columnText="March 16"
-                                columnWidth={200}
-                                height={0}
-                                intl={
-                                  Object {
-                                    "defaultFormats": Object {},
-                                    "defaultLocale": "en",
-                                    "formatDate": [Function],
-                                    "formatHTMLMessage": [Function],
-                                    "formatMessage": [Function],
-                                    "formatNumber": [Function],
-                                    "formatPlural": [Function],
-                                    "formatRelative": [Function],
-                                    "formatTime": [Function],
-                                    "formats": Object {},
-                                    "formatters": Object {
-                                      "getDateTimeFormat": [Function],
-                                      "getMessageFormat": [Function],
-                                      "getNumberFormat": [Function],
-                                      "getPluralFormat": [Function],
-                                      "getRelativeFormat": [Function],
-                                    },
-                                    "locale": "en",
-                                    "messages": null,
-                                    "now": [Function],
-                                    "onError": [Function],
-                                    "textComponent": "span",
-                                    "timeZone": null,
-                                  }
-                                }
-                                maximumWidth={300}
-                                minimumWidth={60}
-                                onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
-                                onResizeMouseUp={[Function]}
-                                setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
-                              >
-                                <div
-                                  aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
-                                  className="resize-handle"
-                                  draggable={true}
-                                  onBlur={[Function]}
-                                  onFocus={[Function]}
-                                  onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
-                                  onMouseEnter={[Function]}
-                                  onMouseLeave={[Function]}
-                                  onMouseUp={[Function]}
-                                  role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -19431,115 +16221,16 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -19547,7 +16238,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -19555,16 +16245,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -19591,11 +16271,14 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -19604,6 +16287,8 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -19615,7 +16300,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -19625,43 +16309,21 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -19692,35 +16354,32 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -19849,11 +16508,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -19881,7 +16535,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -19900,42 +16553,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -21689,7 +18306,17 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -21702,25 +18329,6 @@ exports[`Row selection verifies Shift+Space honors the anchor established by row
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -22326,7 +18934,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -22472,6 +19079,7 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -22508,6 +19116,7 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -22515,136 +19124,18 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -22684,11 +19175,14 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -22710,7 +19204,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -22720,79 +19213,15 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -22833,11 +19262,14 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -22859,7 +19291,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -22869,77 +19300,21 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -22970,35 +19345,32 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -23012,104 +19384,15 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -23150,11 +19433,14 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -23176,7 +19462,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -23186,77 +19471,21 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -23287,35 +19516,32 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -23338,115 +19564,16 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -23454,7 +19581,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -23462,16 +19588,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -23498,11 +19614,14 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -23511,6 +19630,8 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -23522,7 +19643,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -23532,43 +19652,21 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -23599,35 +19697,32 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -23756,11 +19851,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -23788,7 +19878,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -23807,42 +19896,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -25596,7 +21649,17 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -25609,25 +21672,6 @@ exports[`Row selection verifies callbacks when Shift+Down contracts the range of
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -26153,7 +22197,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -26299,6 +22342,7 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -26335,6 +22379,7 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -26342,136 +22387,18 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -26511,11 +22438,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -26537,7 +22467,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -26547,79 +22476,15 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -26660,11 +22525,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -26686,7 +22554,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -26696,77 +22563,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -26797,35 +22608,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -26839,104 +22647,15 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -26977,11 +22696,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -27003,7 +22725,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -27013,77 +22734,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -27114,35 +22779,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -27165,115 +22827,16 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -27281,7 +22844,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -27289,16 +22851,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -27325,11 +22877,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -27338,6 +22893,8 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -27349,7 +22906,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -27359,43 +22915,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -27426,35 +22960,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -27583,11 +23114,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -27615,7 +23141,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -27634,42 +23159,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -29423,7 +24912,17 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -29436,25 +24935,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -30030,7 +25510,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -30175,6 +25654,7 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -30203,6 +25683,7 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -30210,125 +25691,17 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -30369,11 +25742,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -30395,7 +25771,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -30405,77 +25780,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={0}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={0}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={0}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -30506,35 +25825,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -30548,104 +25864,15 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -30686,11 +25913,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -30712,7 +25942,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -30722,77 +25951,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -30823,35 +25996,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -30874,115 +26044,16 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -30990,7 +26061,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={2}
                           displayName="March 17"
@@ -30998,16 +26068,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -31034,11 +26094,14 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -31047,6 +26110,8 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -31058,7 +26123,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -31068,77 +26132,21 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -31169,35 +26177,32 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -31229,90 +26234,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
                           "isMasked": true,
                         },
                       ]
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                  </tr>
-                </thead>
-              </Memo(ColumnHeader)>
-              <tbody>
-                <Row
-                  cells={
-                    Array [
-                      Object {
-                        "content": "Heart Rate Monitored (bpm)",
-                        "isSelectable": false,
-                      },
-                      Object {
-                        "content": "",
-                      },
-                      Object {
-                        "content": "66",
-                        "isMasked": true,
-                      },
-                    ]
-                  }
-                  displayedColumns={
-                    Array [
-                      Object {
-                        "displayName": " Vitals",
-                        "id": "Column-0",
-                      },
-                      Object {
-                        "displayName": "March 16",
-                        "id": "Column-1",
-                      },
-                      Object {
-                        "displayName": "March 17",
-                        "id": "Column-2",
-                        "isSelectable": false,
-                      },
-                    ]
-                  }
-                  height="2.5rem"
-                  id="1"
-                  key="1"
-                  onCellSelect={[Function]}
-                  rowHeaderIndex={0}
-                  rowIndex={1}
-                >
-                  <tr
-                    className="row"
-                    onMouseEnter={null}
-                    onMouseLeave={null}
-                    style={
-                      Object {
-                        "height": "2.5rem",
-                      }
->>>>>>> f0c547b77 (Copy the Jest updates)
                     }
                     displayedColumns={
                       Array [
@@ -32616,7 +27537,17 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -32629,25 +27560,6 @@ exports[`Row selection verifies callbacks when Shift+Down is used and row select
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -33213,7 +28125,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -33359,6 +28270,7 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -33395,6 +28307,7 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -33402,136 +28315,18 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -33571,11 +28366,14 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -33597,7 +28395,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -33607,79 +28404,15 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -33720,11 +28453,14 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -33746,7 +28482,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -33756,77 +28491,21 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -33857,35 +28536,32 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -33899,104 +28575,15 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -34037,11 +28624,14 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -34063,7 +28653,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -34073,77 +28662,21 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -34174,35 +28707,32 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -34225,115 +28755,16 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -34341,7 +28772,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -34349,16 +28779,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -34385,11 +28805,14 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -34398,6 +28821,8 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -34409,7 +28834,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -34419,43 +28843,21 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -34486,35 +28888,32 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -34643,11 +29042,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -34675,7 +29069,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -34694,42 +29087,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -36483,7 +30840,17 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -36496,25 +30863,6 @@ exports[`Row selection verifies callbacks when Shift+Down more than one. 1`] = `
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -37072,7 +31420,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -37218,6 +31565,7 @@ exports[`Row selection verifies multiple independent ranges can be created with
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -37254,6 +31602,7 @@ exports[`Row selection verifies multiple independent ranges can be created with
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -37261,136 +31610,18 @@ exports[`Row selection verifies multiple independent ranges can be created with
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -37430,11 +31661,14 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -37456,7 +31690,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -37466,79 +31699,15 @@ exports[`Row selection verifies multiple independent ranges can be created with
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -37579,11 +31748,14 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -37605,7 +31777,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -37615,77 +31786,21 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -37716,35 +31831,32 @@ exports[`Row selection verifies multiple independent ranges can be created with
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -37758,104 +31870,15 @@ exports[`Row selection verifies multiple independent ranges can be created with
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -37896,11 +31919,14 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -37922,7 +31948,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -37932,77 +31957,21 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -38033,35 +32002,32 @@ exports[`Row selection verifies multiple independent ranges can be created with
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -38084,115 +32050,16 @@ exports[`Row selection verifies multiple independent ranges can be created with
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -38200,7 +32067,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -38208,16 +32074,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -38244,11 +32100,14 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -38257,6 +32116,8 @@ exports[`Row selection verifies multiple independent ranges can be created with
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -38268,7 +32129,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -38278,43 +32138,21 @@ exports[`Row selection verifies multiple independent ranges can be created with
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -38345,35 +32183,32 @@ exports[`Row selection verifies multiple independent ranges can be created with
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -38502,11 +32337,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -38534,7 +32364,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -38553,42 +32382,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -40342,7 +34135,17 @@ exports[`Row selection verifies multiple independent ranges can be created with
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -40355,25 +34158,6 @@ exports[`Row selection verifies multiple independent ranges can be created with
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -40891,7 +34675,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -41037,6 +34820,7 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -41073,6 +34857,7 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -41080,136 +34865,18 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -41249,11 +34916,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -41275,7 +34945,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -41285,79 +34954,15 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -41398,11 +35003,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -41424,7 +35032,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -41434,77 +35041,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -41535,35 +35086,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -41577,104 +35125,15 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -41715,11 +35174,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -41741,7 +35203,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -41751,77 +35212,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -41852,35 +35257,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -41903,115 +35305,16 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -42019,7 +35322,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -42027,16 +35329,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -42063,11 +35355,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -42076,6 +35371,8 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -42087,7 +35384,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -42097,43 +35393,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -42164,35 +35438,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -42321,11 +35592,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -42353,7 +35619,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -42372,42 +35637,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -44161,7 +37390,17 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -44174,25 +37413,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -44710,7 +37930,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -44856,6 +38075,7 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -44892,6 +38112,7 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -44899,136 +38120,18 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -45068,11 +38171,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -45094,7 +38200,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -45104,79 +38209,15 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -45217,11 +38258,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -45243,7 +38287,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -45253,77 +38296,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -45354,35 +38341,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -45396,104 +38380,15 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -45534,11 +38429,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -45560,7 +38458,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -45570,77 +38467,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -45671,35 +38512,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -45722,115 +38560,16 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -45838,7 +38577,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -45846,16 +38584,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -45882,11 +38610,14 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -45895,6 +38626,8 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -45906,7 +38639,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -45916,43 +38648,21 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -45983,35 +38693,32 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -46140,11 +38847,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -46172,7 +38874,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -46191,42 +38892,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -47980,7 +40645,17 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -47993,25 +40668,6 @@ exports[`Row selection verifies only onRowSelect is called when mouse is used to
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -48529,7 +41185,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -48675,6 +41330,7 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -48711,6 +41367,7 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -48718,136 +41375,18 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -48887,11 +41426,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -48913,7 +41455,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -48923,79 +41464,15 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -49036,11 +41513,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -49062,7 +41542,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -49072,77 +41551,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -49173,35 +41596,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -49215,104 +41635,15 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -49353,11 +41684,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -49379,7 +41713,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -49389,77 +41722,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -49490,35 +41767,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -49541,115 +41815,16 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -49657,7 +41832,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -49665,16 +41839,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -49701,11 +41865,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -49714,6 +41881,8 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -49725,7 +41894,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -49735,43 +41903,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -49802,35 +41948,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -49959,11 +42102,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -49991,7 +42129,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -50010,42 +42147,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -51799,7 +43900,17 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -51812,25 +43923,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -52348,7 +44440,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -52494,6 +44585,7 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -52530,6 +44622,7 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -52537,136 +44630,18 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -52706,11 +44681,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -52732,7 +44710,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -52742,79 +44719,15 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -52855,11 +44768,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -52881,7 +44797,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -52891,77 +44806,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -52992,35 +44851,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -53034,104 +44890,15 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -53172,11 +44939,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -53198,7 +44968,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -53208,77 +44977,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -53309,35 +45022,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -53360,115 +45070,16 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -53476,7 +45087,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -53484,16 +45094,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -53520,11 +45120,14 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -53533,6 +45136,8 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -53544,7 +45149,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -53554,43 +45158,21 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -53621,35 +45203,32 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -53778,11 +45357,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -53810,7 +45384,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -53829,42 +45402,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -55618,7 +47155,17 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -55631,25 +47178,6 @@ exports[`Row selection verifies only onRowSelect is called when space is used to
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -56163,7 +47691,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -56309,6 +47836,7 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -56345,6 +47873,7 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -56352,136 +47881,18 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -56521,11 +47932,14 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -56547,7 +47961,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -56557,79 +47970,15 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -56670,11 +48019,14 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -56696,7 +48048,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -56706,77 +48057,21 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -56807,35 +48102,32 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -56849,104 +48141,15 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -56987,11 +48190,14 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -57013,7 +48219,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -57023,77 +48228,21 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -57124,35 +48273,32 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -57175,115 +48321,16 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -57291,7 +48338,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -57299,16 +48345,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -57335,11 +48371,14 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -57348,6 +48387,8 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -57359,7 +48400,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -57369,43 +48409,21 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -57436,35 +48454,32 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -57593,11 +48608,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -57625,7 +48635,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -57644,42 +48653,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -59433,7 +50406,17 @@ exports[`Row selection verifies row selection when space is pressed on a masked
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -59446,25 +50429,6 @@ exports[`Row selection verifies row selection when space is pressed on a masked
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -59978,7 +50942,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -60124,6 +51087,7 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -60160,6 +51124,7 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -60167,136 +51132,18 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "id": "WorklistDataGrid-rowSelectionColumn",
-                      "isResizable": false,
-                      "isSelectable": true,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 40,
-                    },
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      headerHeight="2.5rem"
-                      id="WorklistDataGrid-rowSelectionColumn"
-                      isActive={false}
-                      isResizable={false}
-                      isResizeActive={false}
-                      isSelectable={true}
-                      key="WorklistDataGrid-rowSelectionColumn"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={40}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         headerHeight="2.5rem"
                         id="WorklistDataGrid-rowSelectionColumn"
-<<<<<<< HEAD
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
->>>>>>> f0c547b77 (Copy the Jest updates)
                         isResizable={false}
                         isResizeActive={false}
                         isSelectable={true}
-<<<<<<< HEAD
-<<<<<<< HEAD
                         key="WorklistDataGrid-rowSelectionColumn"
                         maximumWidth={300}
                         minimumWidth={60}
-=======
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                        maximumWidth={300}
-                        minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -60336,11 +51183,14 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={false}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -60362,7 +51212,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                             >
@@ -60372,79 +51221,15 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                            <span />
-                          </div>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -60485,11 +51270,14 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -60511,7 +51299,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -60521,77 +51308,21 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -60622,35 +51353,32 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -60664,104 +51392,15 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -60802,11 +51441,14 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -60828,7 +51470,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -60838,77 +51479,21 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
-                              height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
                               height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -60939,35 +51524,32 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -60990,115 +51572,16 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={3}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={3}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -61106,7 +51589,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={3}
                           displayName="March 17"
@@ -61114,16 +51596,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -61150,11 +51622,14 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -61163,6 +51638,8 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -61174,7 +51651,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -61184,43 +51660,21 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={3}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={3}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
+                              isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
+                              onResizeHandleChange={[Function]}
                               onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                             >
                               <ColumnResizeHandle
                                 columnIndex={3}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -61251,35 +51705,32 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -61408,11 +51859,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                             <Cell
                               columnId="WorklistDataGrid-rowSelectionColumn"
                               columnIndex={0}
-=======
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
                               intl={
                                 Object {
                                   "defaultFormats": Object {},
@@ -61440,7 +51886,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                                   "timeZone": null,
                                 }
                               }
-<<<<<<< HEAD
                               isMasked={false}
                               isRowHeader={false}
                               isSelectable={true}
@@ -61459,42 +51904,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
                                     "left": 0,
                                   }
                                 }
-=======
-                              isActive={false}
-                              maximumWidth={300}
-                              minimumWidth={60}
-                              onResizeHandleChange={[Function]}
-                              onResizeMouseDown={[Function]}
-                              onResizeMouseUp={[Function]}
-                            >
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-<<<<<<< HEAD
-                                role="slider"
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
->>>>>>> d5c6ea0e7 (updated snapshots)
                                 tabIndex={-1}
                               >
                                 <FocusTrap
@@ -63248,7 +53657,17 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -63261,25 +53680,6 @@ exports[`Row selection verifies row selection when space is pressed on a non-sel
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -63751,7 +54151,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -63896,6 +54295,7 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -63924,6 +54324,7 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -63931,125 +54332,17 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -64090,11 +54383,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -64116,7 +54412,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -64126,77 +54421,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={0}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={0}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={0}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -64227,35 +54466,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -64269,104 +54505,15 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -64407,11 +54554,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -64433,7 +54583,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -64443,77 +54592,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -64544,35 +54637,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -64595,115 +54685,16 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -64711,7 +54702,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={2}
                           displayName="March 17"
@@ -64719,16 +54709,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -64755,11 +54735,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -64768,6 +54751,8 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -64779,7 +54764,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -64789,77 +54773,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -64890,35 +54818,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -64950,90 +54875,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           "isMasked": true,
                         },
                       ]
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                  </tr>
-                </thead>
-              </Memo(ColumnHeader)>
-              <tbody>
-                <Row
-                  cells={
-                    Array [
-                      Object {
-                        "content": "Heart Rate Monitored (bpm)",
-                        "isSelectable": false,
-                      },
-                      Object {
-                        "content": "",
-                      },
-                      Object {
-                        "content": "66",
-                        "isMasked": true,
-                      },
-                    ]
-                  }
-                  displayedColumns={
-                    Array [
-                      Object {
-                        "displayName": " Vitals",
-                        "id": "Column-0",
-                      },
-                      Object {
-                        "displayName": "March 16",
-                        "id": "Column-1",
-                      },
-                      Object {
-                        "displayName": "March 17",
-                        "id": "Column-2",
-                        "isSelectable": false,
-                      },
-                    ]
-                  }
-                  height="2.5rem"
-                  id="1"
-                  key="1"
-                  onCellSelect={[Function]}
-                  rowHeaderIndex={0}
-                  rowIndex={1}
-                >
-                  <tr
-                    className="row"
-                    onMouseEnter={null}
-                    onMouseLeave={null}
-                    style={
-                      Object {
-                        "height": "2.5rem",
-                      }
->>>>>>> f0c547b77 (Copy the Jest updates)
                     }
                     displayedColumns={
                       Array [
@@ -66337,7 +56178,17 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -66350,25 +56201,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}
@@ -66840,7 +56672,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
             ]
           }
         >
-<<<<<<< HEAD
           <Component
             columnHeaderHeight="2.5rem"
             defaultColumnWidth={200}
@@ -66985,6 +56816,7 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                 tabIndex={0}
               >
                 <Memo(ColumnHeader)
+                  activeColumnResizing={false}
                   columns={
                     Array [
                       Object {
@@ -67013,6 +56845,7 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                   }
                   headerHeight="2.5rem"
                   onColumnSelect={[Function]}
+                  onResizeHandleChange={[Function]}
                   onResizeMouseDown={[Function]}
                   tableHeight={0}
                 >
@@ -67020,125 +56853,17 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                     <tr
                       className="column-header-row"
                       height="2.5rem"
-=======
-          <div
-            className="data-grid-container"
-          >
-            <table
-              className="data-grid"
-              id="test-terra-worklist-data-grid"
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseDown={[Function]}
-              role="grid"
-              tabIndex={0}
-            >
-              <Memo(ColumnHeader)
-                activeColumnResizing={false}
-                columns={
-                  Array [
-                    Object {
-                      "displayName": " Vitals",
-                      "id": "Column-0",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 16",
-                      "id": "Column-1",
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                    Object {
-                      "displayName": "March 17",
-                      "id": "Column-2",
-                      "isSelectable": false,
-                      "maximumWidth": 300,
-                      "minimumWidth": 60,
-                      "width": 200,
-                    },
-                  ]
-                }
-                headerHeight="2.5rem"
-                onColumnSelect={[Function]}
-                onResizeHandleChange={[Function]}
-                onResizeMouseDown={[Function]}
-                tableHeight={0}
-              >
-                <thead>
-                  <tr
-                    className="column-header-row"
-                    height="2.5rem"
-                  >
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={0}
-                      displayName=" Vitals"
-                      headerHeight="2.5rem"
-                      id="Column-0"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-0"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
->>>>>>> f0c547b77 (Copy the Jest updates)
                     >
                       <InjectIntl(ColumnHeaderCell)
                         columnIndex={0}
                         displayName=" Vitals"
                         headerHeight="2.5rem"
                         id="Column-0"
-<<<<<<< HEAD
-                        key="Column-0"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-0"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -67179,11 +56904,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -67205,7 +56933,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -67215,77 +56942,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                               Vitals
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={0}
-                            columnText=" Vitals"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={0}
-                              columnResizeIncrement={10}
                               columnText=" Vitals"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={0}
+                                columnResizeIncrement={10}
                                 columnText=" Vitals"
                                 columnWidth={200}
                                 height={0}
@@ -67316,35 +56987,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label=" Vitals"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -67358,104 +57026,15 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={1}
-                      displayName="March 16"
-                      headerHeight="2.5rem"
-                      id="Column-1"
-                      isActive={false}
-                      isResizeActive={false}
-                      key="Column-1"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={1}
                         displayName="March 16"
                         headerHeight="2.5rem"
                         id="Column-1"
-<<<<<<< HEAD
-                        key="Column-1"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
-                        isSelectable={true}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-1"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -67496,11 +57075,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={true}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -67522,7 +57104,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -67532,77 +57113,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 16
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={1}
-                            columnText="March 16"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={1}
-                              columnResizeIncrement={10}
                               columnText="March 16"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={1}
+                                columnResizeIncrement={10}
                                 columnText="March 16"
                                 columnWidth={200}
                                 height={0}
@@ -67633,35 +57158,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 16"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -67684,115 +57206,16 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         </ColumnHeaderCell>
                       </InjectIntl(ColumnHeaderCell)>
                       <InjectIntl(ColumnHeaderCell)
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                          <div
-                            className="pinned-columns-divider"
-                            style={
-                              Object {
-                                "height": 0,
-                                "left": 199,
-                              }
-                            }
-                          />
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                    <InjectIntl(ColumnHeaderCell)
-                      columnIndex={2}
-                      displayName="March 17"
-                      headerHeight="2.5rem"
-                      id="Column-2"
-                      isActive={false}
-                      isResizeActive={false}
-                      isSelectable={false}
-                      key="Column-2"
-                      maximumWidth={300}
-                      minimumWidth={60}
-                      onColumnSelect={[Function]}
-                      onResizeHandleChange={[Function]}
-                      onResizeMouseDown={[Function]}
-                      rowIndex={0}
-                      tableHeight={0}
-                      width={200}
-                    >
-                      <ColumnHeaderCell
->>>>>>> f0c547b77 (Copy the Jest updates)
                         columnIndex={2}
                         displayName="March 17"
                         headerHeight="2.5rem"
                         id="Column-2"
-<<<<<<< HEAD
-                        isSelectable={false}
-                        key="Column-2"
-                        maximumWidth={300}
-                        minimumWidth={60}
-=======
-                        intl={
-                          Object {
-                            "defaultFormats": Object {},
-                            "defaultLocale": "en",
-                            "formatDate": [Function],
-                            "formatHTMLMessage": [Function],
-                            "formatMessage": [Function],
-                            "formatNumber": [Function],
-                            "formatPlural": [Function],
-                            "formatRelative": [Function],
-                            "formatTime": [Function],
-                            "formats": Object {},
-                            "formatters": Object {
-                              "getDateTimeFormat": [Function],
-                              "getMessageFormat": [Function],
-                              "getNumberFormat": [Function],
-                              "getPluralFormat": [Function],
-                              "getRelativeFormat": [Function],
-                            },
-                            "locale": "en",
-                            "messages": null,
-                            "now": [Function],
-                            "onError": [Function],
-                            "textComponent": "span",
-                            "timeZone": null,
-                          }
-                        }
                         isActive={false}
-                        isResizable={true}
                         isResizeActive={false}
                         isSelectable={false}
-<<<<<<< HEAD
-                        maximumWidth={500}
-                        minimumWidth={100}
->>>>>>> f0c547b77 (Copy the Jest updates)
-=======
+                        key="Column-2"
                         maximumWidth={300}
                         minimumWidth={60}
->>>>>>> d5c6ea0e7 (updated snapshots)
                         onColumnSelect={[Function]}
                         onResizeHandleChange={[Function]}
                         onResizeMouseDown={[Function]}
@@ -67800,7 +57223,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                         tableHeight={0}
                         width={200}
                       >
-<<<<<<< HEAD
                         <ColumnHeaderCell
                           columnIndex={2}
                           displayName="March 17"
@@ -67808,16 +57230,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           headerHeight="2.5rem"
                           id="Column-2"
                           intl={
-=======
-                        <th
-                          className="column-header"
-                          key="Column-2"
-                          onKeyDown={[Function]}
-                          onMouseDown={[Function]}
-                          role="columnheader"
-                          scope="col"
-                          style={
->>>>>>> f0c547b77 (Copy the Jest updates)
                             Object {
                               "defaultFormats": Object {},
                               "defaultLocale": "en",
@@ -67844,11 +57256,14 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               "timeZone": null,
                             }
                           }
+                          isActive={false}
                           isResizable={true}
+                          isResizeActive={false}
                           isSelectable={false}
                           maximumWidth={300}
                           minimumWidth={60}
                           onColumnSelect={[Function]}
+                          onResizeHandleChange={[Function]}
                           onResizeMouseDown={[Function]}
                           rowIndex={0}
                           tableHeight={0}
@@ -67857,6 +57272,8 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           <th
                             className="column-header"
                             key="Column-2"
+                            onKeyDown={[Function]}
+                            onMouseDown={[Function]}
                             role="columnheader"
                             scope="col"
                             style={
@@ -67868,7 +57285,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                             }
                             tabIndex={-1}
                           >
-<<<<<<< HEAD
                             <div
                               className="header-container"
                               role="button"
@@ -67878,77 +57294,21 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                               </span>
                             </div>
                             <InjectIntl(ColumnResizeHandle)
-=======
-                            <span>
-                              March 17
-                            </span>
-                          </div>
-                          <InjectIntl(ColumnResizeHandle)
-                            columnIndex={2}
-                            columnText="March 17"
-                            columnWidth={200}
-                            height={0}
-                            isActive={false}
-                            maximumWidth={300}
-                            minimumWidth={60}
-                            onResizeHandleChange={[Function]}
-                            onResizeMouseDown={[Function]}
-                            onResizeMouseUp={[Function]}
-                          >
-                            <ColumnResizeHandle
->>>>>>> f0c547b77 (Copy the Jest updates)
                               columnIndex={2}
-                              columnResizeIncrement={10}
                               columnText="March 17"
                               columnWidth={200}
-<<<<<<< HEAD
-<<<<<<< HEAD
                               height={0}
-                              maximumWidth={300}
-                              minimumWidth={60}
-=======
-=======
-                              height={0}
->>>>>>> d5c6ea0e7 (updated snapshots)
-                              intl={
-                                Object {
-                                  "defaultFormats": Object {},
-                                  "defaultLocale": "en",
-                                  "formatDate": [Function],
-                                  "formatHTMLMessage": [Function],
-                                  "formatMessage": [Function],
-                                  "formatNumber": [Function],
-                                  "formatPlural": [Function],
-                                  "formatRelative": [Function],
-                                  "formatTime": [Function],
-                                  "formats": Object {},
-                                  "formatters": Object {
-                                    "getDateTimeFormat": [Function],
-                                    "getMessageFormat": [Function],
-                                    "getNumberFormat": [Function],
-                                    "getPluralFormat": [Function],
-                                    "getRelativeFormat": [Function],
-                                  },
-                                  "locale": "en",
-                                  "messages": null,
-                                  "now": [Function],
-                                  "onError": [Function],
-                                  "textComponent": "span",
-                                  "timeZone": null,
-                                }
-                              }
                               isActive={false}
                               maximumWidth={300}
                               minimumWidth={60}
                               onResizeHandleChange={[Function]}
->>>>>>> f0c547b77 (Copy the Jest updates)
                               onResizeMouseDown={[Function]}
                               onResizeMouseUp={[Function]}
                               setIsActive={[Function]}
                             >
-<<<<<<< HEAD
                               <ColumnResizeHandle
                                 columnIndex={2}
+                                columnResizeIncrement={10}
                                 columnText="March 17"
                                 columnWidth={200}
                                 height={0}
@@ -67979,35 +57339,32 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                                     "timeZone": null,
                                   }
                                 }
+                                isActive={false}
                                 maximumWidth={300}
                                 minimumWidth={60}
+                                onResizeHandleChange={[Function]}
                                 onResizeMouseDown={[Function]}
-<<<<<<< HEAD
-=======
                                 onResizeMouseUp={[Function]}
                                 setIsActive={[Function]}
->>>>>>> b81bf7514 (updated snapshots)
                               >
                                 <div
                                   aria-hidden={true}
-                                  aria-label="March 17"
-                                  aria-valuemax={300}
-                                  aria-valuemin={60}
-                                  aria-valuenow={200}
-                                  aria-valuetext="Terra.dataGrid.resizeHandleValueText"
+                                  aria-label={null}
+                                  aria-valuemax={null}
+                                  aria-valuemin={null}
+                                  aria-valuenow={null}
+                                  aria-valuetext={null}
                                   className="resize-handle"
                                   draggable={true}
                                   onBlur={[Function]}
+                                  onClick={[Function]}
                                   onFocus={[Function]}
+                                  onKeyDown={[Function]}
                                   onMouseDown={[Function]}
-<<<<<<< HEAD
-                                  role="slider"
-=======
                                   onMouseEnter={[Function]}
                                   onMouseLeave={[Function]}
                                   onMouseUp={[Function]}
                                   role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
                                   style={
                                     Object {
                                       "height": "0px",
@@ -68039,90 +57396,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
                           "isMasked": true,
                         },
                       ]
-=======
-                              <div
-                                aria-hidden={true}
-                                aria-label={null}
-                                aria-valuemax={null}
-                                aria-valuemin={null}
-                                aria-valuenow={null}
-                                aria-valuetext={null}
-                                className="resize-handle"
-                                draggable={true}
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                onMouseDown={[Function]}
-                                onMouseEnter={[Function]}
-                                onMouseLeave={[Function]}
-                                onMouseUp={[Function]}
-                                role="divider"
-                                style={
-                                  Object {
-                                    "height": "0px",
-                                  }
-                                }
-                                tabIndex={-1}
-                              />
-                            </ColumnResizeHandle>
-                          </InjectIntl(ColumnResizeHandle)>
-                        </th>
-                      </ColumnHeaderCell>
-                    </InjectIntl(ColumnHeaderCell)>
-                  </tr>
-                </thead>
-              </Memo(ColumnHeader)>
-              <tbody>
-                <Row
-                  cells={
-                    Array [
-                      Object {
-                        "content": "Heart Rate Monitored (bpm)",
-                        "isSelectable": false,
-                      },
-                      Object {
-                        "content": "",
-                      },
-                      Object {
-                        "content": "66",
-                        "isMasked": true,
-                      },
-                    ]
-                  }
-                  displayedColumns={
-                    Array [
-                      Object {
-                        "displayName": " Vitals",
-                        "id": "Column-0",
-                      },
-                      Object {
-                        "displayName": "March 16",
-                        "id": "Column-1",
-                      },
-                      Object {
-                        "displayName": "March 17",
-                        "id": "Column-2",
-                        "isSelectable": false,
-                      },
-                    ]
-                  }
-                  height="2.5rem"
-                  id="1"
-                  key="1"
-                  onCellSelect={[Function]}
-                  rowHeaderIndex={0}
-                  rowIndex={1}
-                >
-                  <tr
-                    className="row"
-                    onMouseEnter={null}
-                    onMouseLeave={null}
-                    style={
-                      Object {
-                        "height": "2.5rem",
-                      }
->>>>>>> f0c547b77 (Copy the Jest updates)
                     }
                     displayedColumns={
                       Array [
@@ -69426,7 +58699,17 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
               <VisuallyHiddenText
                 aria-atomic="true"
                 aria-live="polite"
-<<<<<<< HEAD
+                text={null}
+              >
+                <span
+                  aria-atomic="true"
+                  aria-live="polite"
+                  className="visually-hidden-text"
+                />
+              </VisuallyHiddenText>
+              <VisuallyHiddenText
+                aria-atomic="true"
+                aria-live="polite"
                 text={null}
               >
                 <span
@@ -69439,25 +58722,6 @@ exports[`WorklistDataGrid verifies onCellSelect callback is not triggered when s
           </Component>
         </InjectIntl(Component)>
       </ForwardRef>
-=======
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-            <VisuallyHiddenText
-              aria-atomic="true"
-              aria-live="polite"
-              text={null}
-            >
-              <span
-                aria-atomic="true"
-                aria-live="polite"
-                className="visually-hidden-text"
-              />
-            </VisuallyHiddenText>
-          </div>
-        </DataGrid>
-      </InjectIntl(DataGrid)>
->>>>>>> f0c547b77 (Copy the Jest updates)
       <VisuallyHiddenText
         aria-live="polite"
         text={null}