consolidate unwanted merges, make navbar hide/unhide according to location on page