ignore the war file
merge