It’d also helpful to track down the devices involved in the conflict, identifying the MAC addresses can give you a clearer idea of what’s going on.
As for the DNS setting, switching from "proxy to upstream DNS" probably won’t fix the conflict unless there’s a specific DNS-related issue. It doesn’t hurt to test, but I’d focus more on the DHCP setup and device configurations.
Enthusiast