diff against svn 7144. If there are still conflicts, please explain. (should be fixed)
HTML preview not available, since no preview renderer could handle it. Try downloading the file instead.