Allow multiple nameservers for one zone
Fix manual merge