updated nav
fixed conflicts