fixed a merge issue and changed small-group, church-leadership, and discipleship routes