Fix a conflict between the problem and HTML.
Merge pull request #3 from moznion/fix/conflicts_between_problem_and_html

Fix a conflict between the problem and HTML.