prepared to merge to navalbattle