Another issue I noticed, the diff.merge call in the ajax service breaks with a NullPointerException when there is an empty line. I'll open a new issue for that as well.