formatted history page
fixed merge error in history