Remove CNAME
Resolve conflict