added dnsmasq daemon
fixed merge conflicts