Removing CNAME
Solving conflicts