removed absolute URLs, updated CNAME
merge conflict resolution