Nav bar completed
resolving confilict