Merge conflict committed in T18355.stderr

See

  7 f :: forall {a}. Num a => a -> Bool -> a -> a                                   
  8 [GblId,                                                                         
  9  Arity=4,                                                                       
 10 <<<<<<< HEAD                                                                    
 11  Str=<1P(MC1(C1(L)),MC1(C1(L)),A,A,A,A,A)><L><1L><L>,                           
 12  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,                  
 13 ||||||| parent of 75ae893f7c (Demand: Format Call SubDemands `Cn(sd)` as `C(n,sd)` (#22231))
 14  Str=<S,1*U(1*C1(C1(U)),1*C1(C1(U)),A,A,A,A,A)><L,U><S,1*U><L,U>,               
 15  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,               
 16 =======                                                                         
 17  Str=<S,1*U(1*C(1,C(1,U)),1*C(1,C(1,U)),A,A,A,A,A)><L,U><S,1*U><L,U>,           
 18  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,               
 19 >>>>>>> 75ae893f7c (Demand: Format Call SubDemands `Cn(sd)` as `C(n,sd)` (#22231))
 20          WorkFree=True, Expandable=True,                                        
 21          Guidance=IF_ARGS [60 0 70 0] 100 0}]                                   
 22 f = \ (@a)                                                                      
 23       ($dNum :: Num a)                                                          
 24       (x :: a)                                                                  
 25       (b :: Bool)                                                               
 26       (eta [OS=OneShot] :: a) ->                                                
 27       case b of {                                                               
 28         False -> - @a $dNum x eta;                                              
 29         True -> + @a $dNum x eta                                                
 30       }