add academy page
add academy page
fix merge conflicts