I doubt it. People are too different from each other for there to be an end to war. Many people are also too hot-headed for there to ever be an end to war. War may become a much smaller scale affair than before, but it will continue in one form or another.