tech+impl
merge conflict on paper.tex
now
now