I've just started commenting on some paragraphs. But since the text is based in one file (index.html), I kept running into merge conflicts.