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