Waterjet manufacturers Omax and Flow International recently announced that patent litigation between the two companies has been settled and that there will be no merger between the companies. Additionally, a cross-licensing agreement has been reached for the patents involved in the litigation.