Update harvested_dois.txt

Author: tmorrell

harvested_dois.txt

@@ -707,7 +707,7 @@ https://doi.org/10.1016/j.psycr.2023.100173
 10.1073/pnas.2315787121
 10.1063/5.0147340
 10.3847/1538-4357/ad1243
-<<<<<<< HEAD
+10.1103/aps.dfd.2017.gfm.p0026
 10.3847/1538-4357/ad12c6
 10.1103/PRXQuantum.5.010319
 10.1103/PRXQuantum.5.010317