Merge error in zed2.rviz

[kirstyellis]

Preliminary Checks

• [X] This issue is not a duplicate. Before opening a new issue, please search existing issues.
• [X] This issue is not a question, feature request, or anything other than a bug report directly related to this project.

Description

It seems that in commit 5b7acdf the rviz config for Zed2 was broken. There are some conflict markers left in the file.

Steps to Reproduce

1. Launching the display launch for zed2 camera results in rviz being loaded with no saved config.

Expected Result

Rviz should open with configuration from a saved rviz config

Actual Result

Rviz opens with just one window and no camera views etc.

ZED Camera model

ZED2

Environment

Ubuntu 22, ROS 2 Humble.

Anything else?

No response