What is the difference between war and armed conflict