Merge commit failure reversed in main.tex.