diff --git a/tests/robot/network/fortinet/fortigate/snmp/network-fortinet-fortigate-snmp.robot b/tests/robot/network/fortinet/fortigate/snmp/network-fortinet-fortigate-snmp.robot
index ab13e79ff..5bfad4334 100644
--- a/tests/robot/network/fortinet/fortigate/snmp/network-fortinet-fortigate-snmp.robot
+++ b/tests/robot/network/fortinet/fortigate/snmp/network-fortinet-fortigate-snmp.robot
@@ -382,10 +382,8 @@ Network Fortinet Fortigate SNMP link monitor
             ...    ${command}
             ...    --critical-packet-loss=${fortinet_fortigate_linkmonitor_test.criticalpacketloss}
         END
-<<<<<<< HEAD
-=======
+
         Log To Console    .    no_newline=true
->>>>>>> d2f6ed1b7b934e98662f00ec0f40e2f063b33828
         Ctn Run Command And Check Result As Strings    ${command}    ${fortinet_fortigate_linkmonitor_test.result}
     END
 
diff --git a/tests/robot/network/teldat/snmp/cpu.robot b/tests/robot/network/teldat/snmp/cpu.robot
index a1ca0a2ff..3fe0542f3 100644
--- a/tests/robot/network/teldat/snmp/cpu.robot
+++ b/tests/robot/network/teldat/snmp/cpu.robot
@@ -30,7 +30,7 @@ CPU ${tc}
     Ctn Run Command And Check Result As Strings    ${command}    ${expected_result}
 
 
-    Examples:         tc  warningcpuutilization5s  criticalcpuutilization5s  warningcpuutilization1m  criticalcpuutilization1m  warningcpuutilization5m  criticalcpuutilization5m  result    --
+    Examples:         tc  warningcpuutilization5s  criticalcpuutilization5s  warningcpuutilization1m  criticalcpuutilization1m  warningcpuutilization5m  criticalcpuutilization5m  expected_result    --
             ...       1   ${EMPTY}                 ${EMPTY}                  ${EMPTY}                 ${EMPTY}                  ${EMPTY}                 ${EMPTY}                  OK: cpu average usage: 1.00 % (5s), 1.00 % (1m), 1.00 % (5m) | 'cpu.utilization.5s.percentage'=1.00%;;;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100
             ...       2   0.5                      ${EMPTY}                  ${EMPTY}                 ${EMPTY}                  ${EMPTY}                 ${EMPTY}                  WARNING: cpu average usage: 1.00 % (5s) | 'cpu.utilization.5s.percentage'=1.00%;0:0.5;;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100
             ...       3   ${EMPTY}                 0.5                       ${EMPTY}                 ${EMPTY}                  ${EMPTY}                 ${EMPTY}                  CRITICAL: cpu average usage: 1.00 % (5s) | 'cpu.utilization.5s.percentage'=1.00%;;0:0.5;0;100 'cpu.utilization.1m.percentage'=1.00%;;;0;100 'cpu.utilization.15m.percentage'=1.00%;;;0;100