Fix case where we were missing nav bar items. while merging.
Fix up test.