Battle

Similar to a war, a battle is a conflict with less violence, and typically does not last more than a day. A battle could simply be a part of a war.