Replacing CNAME file
Fixing merge conflicts