Fix conflict in fitvariants.tex