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