hotfix for unusual but terrible content conflict