[#43565463] fixed merge conflicts in feature navigation

Fixed the feature navigation merge conflicts that were found when trying to merge to prod.