Resolving changes from editing both versions of the CAML paper separately

I realized that I made changes to the CAML paper last night but I only committed and didn't do a pull request, so now there are conflicts in both directions, but they should actually resolve fairly easily on inspection because I only edited my section. I don't think I can resolve them though through the GUI so I'm just making the pull requests now.