A political and economic conflict between two major powers that did not escalate into a full-fledged war.