[FIX] continue fixing order_line <-> contract_line merge