fixing merge conflicts

src/app/tests/suites/certification/PICS.yaml

@@ -8766,94 +8766,6 @@ PICS:
       id: ICDM.C.C00.Rsp
 
     #
-    #RVC Clean Mode Select
-    #
-    #Feature
-    - label:
-          "Does the device support depending on an On/Off cluster implemented on
-          the same DUT?"
-      id: RVCCLEANMS.S.F00
-
-    - label: "Does the device support the extended status feature?"
-      id: RVCCLEANMS.S.F01
-
-    - label:
-          "Does the device implementation deprecate the ChangeToMode command?"
-      id: RVCCLEANMS.S.F02
-
-    #Server Attributes
-    - label: "Does the device implement the StartUpMode attribute?"
-      id: RVCCLEANMS.S.A0004
-
-    - label: "Does the device implement the OnMode attribute?"
-      id: RVCCLEANMS.S.A0005
-
-    #Server Commands recived
-    - label: "Does the device implement receiving the ChangeToMode command?"
-      id: RVCCLEANMS.S.C00.Rsp
-
-    - label:
-          "Does the device implement receiving the ChangeToModeWithStatus
-          command?"
-      id: RVCCLEANMS.S.C01.Rsp
-
-    #server commands generated
-    - label:
-          "Does the device implement sending the ChangeToModeResponse command?"
-      id: RVCCLEANMS.S.C03.Tx
-
-    ##  Dishwasher Alarm Cluster
-
-    - label:
-          "Does the device implement the Dishwasher Alarm cluster as a server?"
-      id: DISHALM.S
-
-    - label:
-          "Does the device implement the Dishwasher Alarm cluster as a client?"
-      id: DISHALM.C
-
-    # Features
-    - label: "Does the device support the Reset command"
-      id: DISHALM.S.F00
-
-    #
-    # Server Attributes
-    #
-    - label: "	Does the device implement the Mask attribute??"
-      id: DISHALM.S.A0000
-
-    - label: "Does the device implement the Latch attribute?"
-      id: DISHALM.S.A0001
-
-    - label: "Does the device implement the State attribute?"
-      id: DISHALM.S.A0002
-
-    - label: "Does the device implement the Supported attribute?"
-      id: DISHALM.S.A0003
-
-    #
-    #Server manual controllable
-    #
-    - label:
-          "Can the Dishwasher Alarm attribute changed by physical control at the
-          device?"
-      id: DISHALM.M.ManuallyControlled
-
-    #
-    #Server events
-    #
-    - label: "Does the device implement the Notify event_?"
-      id: DISHALM.S.E00
-
-    #
-    #Server commands received
-    #
-    - label: "Does the device implement receiving the Reset command?"
-      id: DISHALM.S.C00.Rsp
-
-    - label: "Does the device implement receiving the Modify command?"
-      id: DISHALM.S.C01.Rsp
-    #
     #Operational State
     #
     - label:
@@ -9560,4 +9472,4 @@ PICS:
       id: RVCOPSTATE.C.C02.Tx
 
     - label: "Does the device implement sending the Resume command?"
-      id: RVCOPSTATE.C.C04.Tx
+      id: RVCOPSTATE.C.C04.Tx

src/app/tests/suites/certification/ci-pics-values

@@ -2733,4 +2733,4 @@ REFALM.S.A0002=1
 REFALM.S.A0003=1
 REFALM.S.E00=1
 REFALM.S.C00.Rsp=1
-REFALM.S.C01.Rsp=1
+REFALM.S.C01.Rsp=1