Work on ZeroConf
Fix merge