3cdaf3294040294806097ce9d2180f6ea0161056
angie
  Thu Dec 16 10:16:33 2021 -0800
Since masking of 21846 (S:95) in Delta, AY.115 and AY.116 are identical, and whichever is assigned the node first in matUtils annotate wins -- not good.  This hasn't been released in pango-designation yet, but since there is already an AY.116.1, AY.115 will be merged into AY.116.  Make that change now so we don't produce stochastic output in the meantime.

diff --git src/hg/utils/otto/sarscov2phylo/pango.clade-mutations.tsv src/hg/utils/otto/sarscov2phylo/pango.clade-mutations.tsv
index 06ae038..7135194 100644
--- src/hg/utils/otto/sarscov2phylo/pango.clade-mutations.tsv
+++ src/hg/utils/otto/sarscov2phylo/pango.clade-mutations.tsv
@@ -10,31 +10,30 @@
 AY.102.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G1495T > A27690T > A29700G > T25333C > G25218T
 AY.103	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C24208T
 AY.104	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C745T > T13048C,C23277T
 AY.105	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C2939T > C1063T
 AY.106	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C22326T
 AY.107	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C24863T > A15012G
 AY.108	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G370T > C745T,C823T,C6828T
 AY.109	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C27549T > A11595G > A14836G
 AY.11	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > T11418C > C9891T > C11514T > C5184T > A5584G > C13019T > C22227T > T19516C > C3486T,C18526T,C29509T
 AY.110	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C912A
 AY.111	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C4456T
 AY.112	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G25647T
 AY.112.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G25647T > G29422T > A3997T
 AY.113	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > A10323G > C15240T
 AY.114	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G16914T > G19677T
-AY.115	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461N > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > A10691G
 AY.116	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > A10691G
 AY.116.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > A10691G > C19160T > G20968A > G12071A
 AY.117	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C28708T > C15810T
 AY.118	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > T826C
 AY.119	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G19006T
 AY.119.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G19006T > C8829T > C23506T,G26031T > C2973T > G17338T,T24063C,G25552T,G29392T
 AY.119.2	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > G19006T > C8829T > G23587C
 AY.120	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C6408T
 AY.120.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C6408T > A25003G > A10323N > C11095T
 AY.120.2	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C6408T > A25003G > G174N > C21758T
 AY.120.2.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C6408T > A25003G > G174N > C21758T > C7105T > T27017A > C13138T
 AY.121	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638N > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C23557T > C13168T > G25996T
 AY.121.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638N > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A > C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > C21846N > C23557T > C13168T > G25996T > G28396A > C16726T > C19859T > G29690N > T209N,C27737T
 AY.122	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > G1048T
 AY.122.1	C14408T > C241N > C3037T > A23403G > G29742N > T22917G > T27638C > G28881T > G210N > C21618G > G29402T > C23604G > C25469T > C22995A,C27752T > A28461G > C16466T > T26767C > G15451A > C10029T > C19220T > G28916T > G4181T > C27874T > C7124T > G9053T > C8986T > A11332G > A11201G > C6402T > G1048T > G20937T > C19983T > C23934T