Update CNAME
Homepage test
Conflict fixing