fixed merge conflict
added leaderboard