If two tribes merge and one is at war, if the name changes, does that constitute the tribe at war as being dismissed thus ending the war?