MOD: fixed merge test