merge conflict / uncommented page navigation (which seems to be working)