merge into public site