Fix git merginess

[j6k4m8]

Fixes #2 (mostly) and #3 (entirely, although maybe overzealously, since Overleaf is pretty broad in their diffs)