Resolve conflicts

Author: urfeex

ur_robot_driver/CMakeLists.txt

@@ -214,15 +214,11 @@ if(BUILD_TESTING)
       TIMEOUT
         180
     )
-<<<<<<< HEAD
-    add_launch_test(test/robot_driver.py
-=======
     add_launch_test(test/example_move.py
       TIMEOUT
         180
     )
     add_launch_test(test/integration_test_scaled_joint_controller.py
->>>>>>> fe37d9a (Running integration tests with mock hardware (#1226))
       TIMEOUT
         800
     )

ur_robot_driver/test/test_common.py

@@ -472,8 +472,8 @@ def generate_mock_hardware_test_description(
         "headless_mode": "true",
         "launch_dashboard_client": "true",
         "start_joint_controller": "false",
-        "use_mock_hardware": "true",
-        "mock_sensor_commands": "true",
+        "use_fake_hardware": "true",
+        "fake_sensor_commands": "true",
     }
     if tf_prefix:
         launch_arguments["tf_prefix"] = tf_prefix