Site push
Fixed conflict
Removed CNAME for now