don't merge until you set DNS properly see comment; adding CNAME file