Fix rebasing error in nav