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