Conflicts in doc/doc/tests.tex resolved