He is definitely supposed to still be training the tiefling kids tho he gracefully bows out of conflict and instead shows up at your camp for a fight (that you can talk him out of) next time you rest.