Aircraft subsidy dispute could have happy ending