merge conflict
delete .pdfs