stats page
fixed merge conflict