update to fix conflicts with master

Includes the nav-style-jan4 changes.