Fix duplicate errors form upstream merge