merge conflicts resolved and test snap updated

Signed-off-by: kohinoor98 <kohinoorchatterjee1998@gmail.com>

public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap

@@ -42,17 +42,6 @@ exports[`Monitors renders 1`] = `
           "textOnly": true,
         },
         Object {
-<<<<<<< HEAD
-          "field": "user",
-          "name": "Last updated by",
-          "render": [Function],
-          "sortable": true,
-          "textOnly": true,
-          "truncateText": true,
-        },
-        Object {
-=======
->>>>>>> 48e8be2 (remove last updated backported to 2.2)
           "field": "latestAlert",
           "name": "Latest alert",
           "sortable": false,

public/pages/Monitors/containers/Monitors/utils/tableUtils.js

@@ -28,24 +28,6 @@ export const columns = [
     ),
   },
   {
-<<<<<<< HEAD
-    field: 'user',
-    name: 'Last updated by',
-    sortable: true,
-    truncateText: true,
-    textOnly: true,
-    /* There are 3 cases:
-    1. Monitors created by older versions and never updated.
-       These monitors won’t have User details in the monitor object. `monitor.user` will be null.
-    2. Monitors are created when security plugin is disabled, these will have empty User object.
-       (`monitor.user.name`, `monitor.user.roles` are empty )
-    3. Monitors are created when security plugin is enabled, these will have an User object. */
-    render: (_, item) =>
-      item.monitor.user && item.monitor.user.name ? item.monitor.user.name : '-',
-  },
-  {
-=======
->>>>>>> 48e8be2 (remove last updated backported to 2.2)
     field: 'latestAlert',
     name: 'Latest alert',
     sortable: false,