Complete navigations Panel
resolves merge conflicts