Fix something
Change pdf
Fix conflict