merge resolveD