[#43565463] fixed merge conflicts in feature navigation
Merge pull request #45 from loganbfisher/43565463_fix_feature_nav_conflicts

[#43565463] fixed merge conflicts in feature navigation