fixed merge vars resolution