Fix TypeclassDebug.out after conflicting PR merges
Fix TypeclassDebug.out after conflicting PR merges

ejgallego/coq,ppedrot/coq,silene/coq,JasonGross/coq,SkySkimmer/coq,maximedenes/coq,SkySkimmer/coq,coq/coq,gares/coq,Zimmi48/coq,letouzey/coq-wip,silene/coq,ejgallego/coq,maximedenes/coq,silene/coq,Matafou/coq,coq/coq,Zimmi48/coq,ppedrot/coq,Matafou/coq,coq/coq,Matafou/coq,letouzey/coq-wip,maximedenes/coq,letouzey/coq-wip,ppedrot/coq,gares/coq,coq/coq,JasonGross/coq,SkySkimmer/coq,ppedrot/coq,letouzey/coq-wip,JasonGross/coq,gares/coq,SkySkimmer/coq,ejgallego/coq,gares/coq,JasonGross/coq,ppedrot/coq,gares/coq,Zimmi48/coq,ejgallego/coq,maximedenes/coq,maximedenes/coq,letouzey/coq-wip,Zimmi48/coq