fixing a second merge conflict resolution error for releasing 1.1.7#3621

SteveMacenski merged 1 commit intohumbleros-navigation/navigation2:humblefrom

humble_sync2ros-navigation/navigation2:humble_sync2Copy head branch name to clipboard