Conflict is not contention. 

All contention includes conflict, but conflict does not have to include contention. 

The intention and motivation behind the individual in a conflict determines if there is contention. 

Conflict is a difference in idea and perspective. 

Contention is contempt or anger mixed with the need to be right.