broken changepages on new branch
page navigation changes
page navigation object
post merge fixes