the pdf will only cause a merge conflict every time we push or pull