fix games.html merge conflict