Add cname
Fix conflict