merge war