modified cname
modified cname

Conflicts:
	CNAME