for some reason, the pull request for the proofread-ega1-10 branch absolutely refused to fix its conflicts, so I fixed them locally, but this seems to have pushed all the changes directly to the master branch, which is just so hideously messy. there are now a few errors (such as \begin{enumerate}[label=\emph{(\roman*)}]), but I'll try to fix this all now
for some reason, the pull request for the
proofread-ega1-10
branch absolutely refused to fix its conflicts, so I fixed them locally, but this seems to have pushed all the changes directly to the master branch, which is just so hideously messy. there are now a few errors (such as\begin{enumerate}[label=\emph{(\roman*)}]
), but I'll try to fix this all now