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.
There was an interesting book about some of it, Demonic Males (http://www.amazon.com/Demonic-Males-Origins-Human-Violence/d...). It might be a bit dated now (1997).
http://www.nytimes.com/2014/09/18/science/lethal-violence-in...