Restore merge args; Fix issue finish