What is the difference between war and an armed conflict