Fixed merge issue with DNS fix code