fixed a pretty major git mess up

Merge branch 'tmp'

1 files changed, 24 insertions, 9 deletions

diff --git a/writeup/writeup.fdb_latexmk b/writeup/writeup.fdb_latexmk
index 4eb8edf..b47361e 100644
--- a/writeup/writeup.fdb_latexmk
+++ b/writeup/writeup.fdb_latexmk
@@ -1,20 +1,34 @@
 # Fdb version 4
-["biber writeup"] 1729165737.60584 "writeup.bcf" "writeup.bbl" "writeup" 1729165744.21876 0
-  "writeup.bcf" 1729165743.97126 107694 dbde7571217d22797bd84e95a6105cc0 "pdflatex"
+["biber writeup"] 1729771574.54277 "writeup.bcf" "writeup.bbl" "writeup" 1729771708.58759 0
+  "ref.bib" 1729771562.38134 2468 b35e7c5efed7d858ce458552d0226132 ""
+  "writeup.bcf" 1729771707.81388 108589 174f285ac3ff3038b99ed059f7a735de "pdflatex"
   (generated)
   "writeup.bbl"
   "writeup.blg"
   (rewritten before read)
-["pdflatex"] 1729165741.71817 "writeup.tex" "writeup.pdf" "writeup" 1729165744.21933 0
+["pdflatex"] 1729771701.42851 "writeup.tex" "writeup.pdf" "writeup" 1729771708.58837 0
   "/usr/share/texmf-dist/fonts/map/fontname/texfonts.map" 1727349926 3524 cb3e574dea2d1052e39280babc910dc8 ""
   "/usr/share/texmf-dist/fonts/tfm/public/cm/cmbx12.tfm" 1727349926 1324 c910af8c371558dc20f2d7822f66fe64 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmcsc10.tfm" 1727349926 1300 63a6111ee6274895728663cf4b4e7e81 ""
   "/usr/share/texmf-dist/fonts/tfm/public/cm/cmmi12.tfm" 1727349926 1524 4414a8315f39513458b80dfc63bff03a ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmmi6.tfm" 1727349926 1512 f21f83efb36853c0b70002322c1ab3ad ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmmi8.tfm" 1727349926 1520 eccf95517727cb11801f4f1aee3a21b4 ""
   "/usr/share/texmf-dist/fonts/tfm/public/cm/cmr12.tfm" 1727349926 1288 655e228510b4c2a1abe905c368440826 ""
   "/usr/share/texmf-dist/fonts/tfm/public/cm/cmr17.tfm" 1727349926 1292 296a67155bdbfc32aa9c636f21e91433 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmr6.tfm" 1727349926 1300 b62933e007d01cfd073f79b963c01526 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmr8.tfm" 1727349926 1292 21c1c5bfeaebccffdb478fd231a0997d ""
   "/usr/share/texmf-dist/fonts/tfm/public/cm/cmsy10.tfm" 1727349926 1124 6c73e740cf17375f03eec0ee63599741 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmsy6.tfm" 1727349926 1116 933a60c408fc0a863a92debe84b2d294 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmsy8.tfm" 1727349926 1120 8b7d695260f3cff42e636090a8002094 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmti12.tfm" 1727349926 1484 ed72f8f5cf654cda15ecc8e32bfcbee5 ""
+  "/usr/share/texmf-dist/fonts/tfm/public/cm/cmtt12.tfm" 1727349926 772 9a936b7f5e2ff0557fce0f62822f0bbf ""
   "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb" 1727349926 32080 340ef9bf63678554ee606688e7b5339d ""
+  "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmcsc10.pfb" 1727349926 32001 6aeea3afe875097b1eb0da29acd61e28 ""
   "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb" 1727349926 32722 d7379af29a190c3f453aba36302ff5a9 ""
   "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmr17.pfb" 1727349926 32362 179c33bbf43f19adbb3825bb4e36e57a ""
+  "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmr8.pfb" 1727349926 32726 0a1aea6fcd6468ee2cf64d891f5c43c8 ""
+  "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmti12.pfb" 1727349926 36118 fad905eba93cff5bce1e185fe980a177 ""
+  "/usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt12.pfb" 1727349926 24252 1e4e051947e12dfb50fee0b7f4e26e3a ""
   "/usr/share/texmf-dist/tex/context/base/mkii/supp-pdf.mkii" 1727349926 71627 94eb9990bed73c364d7f53f960cc8c5b ""
   "/usr/share/texmf-dist/tex/generic/atbegshi/atbegshi.sty" 1727349926 24708 5584a51a7101caf7e6bbf1fc27d8f7b1 ""
   "/usr/share/texmf-dist/tex/generic/babel-english/english.ldf" 1727349926 7008 9ff5fdcc865b01beca2b0fe4a46231d4 ""
@@ -166,6 +180,7 @@
   "/usr/share/texmf-dist/tex/latex/pgfopts/pgfopts.sty" 1727349926 5540 d5c60cf09c59da351aa4023ed084e4eb ""
   "/usr/share/texmf-dist/tex/latex/refcount/refcount.sty" 1727349926 9878 9e94e8fa600d95f9c7731bb21dfb67a4 ""
   "/usr/share/texmf-dist/tex/latex/rerunfilecheck/rerunfilecheck.sty" 1727349926 9714 ba3194bd52c8499b3f1e3eb91d409670 ""
+  "/usr/share/texmf-dist/tex/latex/setspace/setspace.sty" 1727349926 22490 8cac309b79a4c53a4ffce4b1b07aead0 ""
   "/usr/share/texmf-dist/tex/latex/tikz-qtree/pgfsubpic.sty" 1727349926 54 f9439ec673a174422959417bbf935693 ""
   "/usr/share/texmf-dist/tex/latex/tikz-qtree/pgfsubpic.tex" 1727349926 8570 d1bab08986c0118f4c006d2f8c250422 ""
   "/usr/share/texmf-dist/tex/latex/tikz-qtree/pgftree.sty" 1727349926 103 1ec4da228521932da66ce8de6a762d94 ""
@@ -180,12 +195,12 @@
   "/usr/share/texmf-dist/web2c/texmf.cnf" 1727349926 41588 b43d3e860a4f94167ee1e725ff526a72 ""
   "/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1727772120.4956 5312047 b07fcd2a9090df96fc745b92a3db793b ""
   "/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1727771987 7112995 7933768d5ebcb328850d23523e531d79 ""
-  "writeup.aux" 1729165743.9646 1562 30e553176a3ea9f9622294f1dd9d8af2 "pdflatex"
-  "writeup.bbl" 1729165739.19796 466 ee04f40f768daeed26442158e95aba61 "biber writeup"
-  "writeup.out" 1729165743.96793 2215 a19c3584f82896fa7f1dce41b813e836 "pdflatex"
-  "writeup.run.xml" 1729165743.9746 2319 506c1b5fa918ae91afb2a783379dbdcd "pdflatex"
-  "writeup.tex" 1729165720.89472 1171 b8d03577e110603d8d57bf2140f400d9 ""
-  "writeup.toc" 1729165743.9746 872 f4079b35910d3bff582bb3ebfada0f73 "pdflatex"
+  "writeup.aux" 1729771707.79055 3676 aacc331e925558339ebbeb6ebd928929 "pdflatex"
+  "writeup.bbl" 1729771578.67125 8633 48689b94449961bffa8b87329604d747 "biber writeup"
+  "writeup.out" 1729771707.80388 2656 b89927ab184d056ee2d4a9d6f8e61754 "pdflatex"
+  "writeup.run.xml" 1729771707.82055 2319 506c1b5fa918ae91afb2a783379dbdcd "pdflatex"
+  "writeup.tex" 1729771699.3706 8693 28d0ccf2cb382a709133d7f2a8a98184 ""
+  "writeup.toc" 1729771707.82055 1103 ffb45d97710b0063a509a983113e9dfb "pdflatex"
   (generated)
   "writeup.aux"
   "writeup.bcf"