adjusted page title again
fixed merge conflict