hopefully fixed cname conflict, need to update