Oil Conflict Heats Up