Fix CNAME conflict