Is This a Man From Jehenda?

The prophesim returned all of the sheep to the master, even though he is actually fighting the master in war. And this shows us the high standards that islam has placed for acquiring property. Another story is also mentioned, and this story is actually scholars differ. Is this the same story that people mistook in the battle of heber? Or is it two different stories? At least two different battles, we find the same type of story.