removed CNAME file from master repo
fixed merge conflict