If I remember correctly (been a while since I studied this stuff), the line leading to homo sapiens diverged before the Chimpanzee/Bonobo divergence. I've read a few things to the effect that humans show both chimp-like and bonobo-like solutions to conflict depending on the context.