fixed conflicts

Makefile

@@ -14,7 +14,7 @@ out/:
 	mkdir -p out/
 
 out/%.md: src/%.lagda | out/
-	agda2html --verbose --link-to-agda-stdlib --local-references --use-jekyll=out/ -i $< -o $@ 2>&1 \
+	agda2html --verbose --link-to-agda-stdlib --link-to-local-agda-names --local-references --use-jekyll=out/ -i $< -o $@ 2>&1 \
 		| sed '/^Generating.*/d; /^Warning\: HTML.*/d; /^reached from the.*/d; /^\s*$$/d'
 	@sed -i '1 s|---|---\nsrc       : $(<)|' $@
 

_includes/next.html

@@ -1,4 +1,4 @@
-<center>
+<p style="text-align:center;">
     {% if page.prev %}
     <a alt="Previous chapter" href="{{ site.baseurl }}{{ page.prev }}">Prev</a>
     &bullet;
@@ -10,4 +10,4 @@
     &bullet;
     <a alt="Next chapter" href="{{ site.baseurl }}{{ page.next }}">Next</a>
     {% endif %}
-</center>
+</p>

src/plfa/Naturals.lagda

@@ -603,9 +603,6 @@ the 1920's.  I was told a joke: "It should be called schönfinkeling,
 but currying is tastier". Only later did I learn that the explanation
 of the misattribution was itself a misattribution.  The idea actually
 appears in the _Begriffschrift_ of Gottlob Frege, published in 1879.
-<!--
-We should call it frigging!
--->
 
 ## The story of creation, revisited