add CNAME file
CNAME merge confict