minor update
ignoring CNAME
resolving conflicts
fixing fakespeare
refixing fakespeare