include nrepl.el and other goodness
resolve merge conflict involving nrepl.el inclusion