Conflict in Marxist theory