merge resolv