Fix merge conflicts.
Add .pdf to .gitignore (since we ignore them every time anyway)