Fix conflicts
Fix conflicts
niteria/haddock,sboosali/haddock,jgm/haddock,randen/haddock,randen/haddock,haskell/haddock,Fuuzetsu/haddock,Helkafen/haddock,Acidburn0zzz/haddock,lamefun/haddock,niteria/haddock,Acidburn0zzz/haddock,idontgetoutmuch/haddock,esmolanka/haddock,JPMoresmau/haddock,beni55/haddock,beni55/haddock,adamse/haddock,Mistuke/haddock,niteria/haddock,Fuuzetsu/haddock,Fuuzetsu/haddock,mrhania/haddock,mrBliss/haddock,haskell/haddock,Wizek/haddock,Fuuzetsu/haddock,haskell/haddock,Acidburn0zzz/haddock,adamse/haddock,idontgetoutmuch/haddock,Wizek/haddock,idontgetoutmuch/haddock,sboosali/haddock,mrBliss/haddock,JPMoresmau/haddock,mrhania/haddock,jstolarek/haddock,Helkafen/haddock,esmolanka/haddock,lamefun/haddock,beni55/haddock,randen/haddock,jstolarek/haddock,jgm/haddock,Mistuke/haddock,mrBliss/haddock,Wizek/haddock,haskell/haddock,haskell/haddock,Mistuke/haddock,Helkafen/haddock,esmolanka/haddock,adamse/haddock,sboosali/haddock,mrhania/haddock,lamefun/haddock,JPMoresmau/haddock