Fix up tag levels after merge