deleted stuff and did top-nav
resolving conflicts