updating nav
fix merge conflict
fix merge conflict
fix merge conflict
fix merge conflict