The former was a warship, the latter mainly a merchant ship