Ending page
merge and fix