Abstract. The article analyzes typology and substance of modern conflicts from the point of international law. It traces the evolution of armed conflict classification in international law and in Russia’s national legislation. It concludes that formal recognition in international law of two categories of conflict – international and non-international – is confronted in practice with the erosion of boundaries between the two, which complicates their definitive classification.