zip code add to nav
zip code add to nav
fixed merge conflict