fix page navigation
merge