Fix conflicts

Signed-off-by: Afreen Misbah <afreen@ibm.com>

diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
index ba8f705ce7d004af0aa70e201817802c70dcf509,dae0160aff256db9ea8f6e24922f9f686323a745..0d57ae3f68a655d1f9313b8051971b3018057fc5
--- 1/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
--- 2/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
@@@ -291,9 -286,7 +291,9 @@@ export class ComponentsModule 
        CheckMarkOutline16,
        ArrowUpRight16,
        InProgress16,
 -      ArrowDown16
 +      ArrowDown16,
 +      Deploy16,
 +      Warning16
      ]);
    }
- }
+ }

diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts
index 7de826aa2e3a2d66c0620264fcce20e8be957136,9028c05a60fe51c6c253c2754cc805c349d2734a..50a3bd6aa9803dc88fcf9f48e09aca7d3cf34b6a
--- 1/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts
--- 2/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts
@@@ -161,10 -150,10 +161,10 @@@ export class ActionLabelsI18n 
    DISCONNECT: string;
    RECONNECT: string;
    AUTHORIZE: string;
-   EXPAND_CLUSTER: string;
+   ADD_STORAGE: string;
    SETUP_MULTISITE_REPLICATION: string;
    NFS_EXPORT: string;
 -
 +  VIEW: string;
    constructor() {
      /* Create a new item */
      this.CREATE = $localize`Create`;
@@@ -253,10 -242,9 +253,10 @@@
      this.CONNECT = $localize`Connect`;
      this.DISCONNECT = $localize`Disconnect`;
      this.RECONNECT = $localize`Reconnect`;
-     this.EXPAND_CLUSTER = $localize`Expand Cluster`;
+     this.ADD_STORAGE = $localize`Add Storage`;
  
      this.NFS_EXPORT = $localize`Create NFS Export`;
 +    this.VIEW = $localize`View`;
    }
  }
  

diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
index 53bd91f9acb54875c22c91873fde363c7d7ee020,4a11f330d6af919b78ac138caaa0395416ffb186..1d7be590d8538965b876a3aa0f78b2ceb28565d5
--- 1/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
--- 2/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
@@@ -164,11 -165,5 +164,11 @@@ export const ICON_TYPE = 
    checkMarkOutline: 'checkmark--outline',
    arrowUpRight: ' arrow--up-right',
    inProgress: 'in-progress',
 -  arrowDown: 'arrow--down'
 +  arrowDown: 'arrow--down',
-   warning: 'warning',
++  warning: 'warning'
 +} as const;
 +
 +export const EMPTY_STATE_IMAGE = {
 +  default: 'assets/empty-state.png',
 +  search: 'assets/empty-state-search.png'
  } as const;

diff --cc src/pybind/mgr/dashboard/openapi.yaml
Simple merge