A better approach would be to make it clear that armed conflict referred to the set of conflicts covered by common articles 2 and 3 of the Geneva Conventions (i.e., international and non-international armed conflicts).
较好的做法是清楚订明武装冲突是指日内瓦四公约共同第2条和第3条涵盖的那些冲突(即国际和非国际武装冲突)。