[ros-diffs] [jimtabor] 26544: Fix build, Error conflict.