merge zipline dualema alg ok