nrepl mode, &c.
fixed merge