vectoriser: fix conflicts
vectoriser: fix conflicts
siddhanathan/ghc,vikraman/ghc,christiaanb/ghc,mcmaniac/ghc,ryantm/ghc,gridaphobe/ghc,siddhanathan/ghc,ekmett/ghc,lukexi/ghc,vikraman/ghc,mcschroeder/ghc,snoyberg/ghc,spacekitteh/smcghc,sdiehl/ghc,tibbe/ghc,hferreiro/replay,AlexanderPankiv/ghc,mcschroeder/ghc,olsner/ghc,GaloisInc/halvm-ghc,hferreiro/replay,ml9951/ghc,gcampax/ghc,holzensp/ghc,AlexanderPankiv/ghc,TomMD/ghc,ezyang/ghc,mettekou/ghc,ekmett/ghc,gcampax/ghc,wxwxwwxxx/ghc,lukexi/ghc-7.8-arm64,GaloisInc/halvm-ghc,da-x/ghc,nkaretnikov/ghc,spacekitteh/smcghc,ghc-android/ghc,anton-dessiatov/ghc,TomMD/ghc,holzensp/ghc,snoyberg/ghc,tjakway/ghcjvm,frantisekfarka/ghc-dsi,wxwxwwxxx/ghc,shlevy/ghc,ezyang/ghc,mcmaniac/ghc,lukexi/ghc-7.8-arm64,vTurbine/ghc,elieux/ghc,AlexanderPankiv/ghc,mfine/ghc,mfine/ghc,vTurbine/ghc,gridaphobe/ghc,jstolarek/ghc,olsner/ghc,olsner/ghc,acowley/ghc,sgillespie/ghc,frantisekfarka/ghc-dsi,gridaphobe/ghc,spacekitteh/smcghc,oldmanmike/ghc,anton-dessiatov/ghc,AlexanderPankiv/ghc,hferreiro/replay,nushio3/ghc,wxwxwwxxx/ghc,bitemyapp/ghc,TomMD/ghc,snoyberg/ghc,elieux/ghc,oldmanmike/ghc,fmthoma/ghc,ghc-android/ghc,ghc-android/ghc,nkaretnikov/ghc,christiaanb/ghc,lukexi/ghc-7.8-arm64,wxwxwwxxx/ghc,TomMD/ghc,ilyasergey/GHC-XAppFix,ghc-android/ghc,acowley/ghc,mcschroeder/ghc,vTurbine/ghc,nathyong/microghc-ghc,ml9951/ghc,lukexi/ghc,elieux/ghc,mcmaniac/ghc,oldmanmike/ghc,mcschroeder/ghc,ekmett/ghc,GaloisInc/halvm-ghc,ilyasergey/GHC-XAppFix,lukexi/ghc,ryantm/ghc,ghc-android/ghc,hferreiro/replay,wxwxwwxxx/ghc,mcschroeder/ghc,nushio3/ghc,urbanslug/ghc,jstolarek/ghc,tibbe/ghc,green-haskell/ghc,anton-dessiatov/ghc,ml9951/ghc,nushio3/ghc,ml9951/ghc,shlevy/ghc,tjakway/ghcjvm,anton-dessiatov/ghc,sdiehl/ghc,green-haskell/ghc,gridaphobe/ghc,ml9951/ghc,tjakway/ghcjvm,christiaanb/ghc,hferreiro/replay,shlevy/ghc,jstolarek/ghc,anton-dessiatov/ghc,mcschroeder/ghc,AlexanderPankiv/ghc,da-x/ghc,ezyang/ghc,forked-upstream-packages-for-ghcjs/ghc,mettekou/ghc,frantisekfarka/ghc-dsi,nathyong/microghc-ghc,tibbe/ghc,mettekou/ghc,TomMD/ghc,urbanslug/ghc,sgillespie/ghc,ml9951/ghc,TomMD/ghc,fmthoma/ghc,holzensp/ghc,sgillespie/ghc,nkaretnikov/ghc,nathyong/microghc-ghc,nushio3/ghc,elieux/ghc,wxwxwwxxx/ghc,tjakway/ghcjvm,siddhanathan/ghc,mfine/ghc,gcampax/ghc,nkaretnikov/ghc,anton-dessiatov/ghc,fmthoma/ghc,green-haskell/ghc,GaloisInc/halvm-ghc,ryantm/ghc,ml9951/ghc,nathyong/microghc-ghc,ilyasergey/GHC-XAppFix,nushio3/ghc,acowley/ghc,tibbe/ghc,AlexanderPankiv/ghc,mfine/ghc,da-x/ghc,nushio3/ghc,nathyong/microghc-ghc,holzensp/ghc,da-x/ghc,fmthoma/ghc,ezyang/ghc,snoyberg/ghc,sdiehl/ghc,wxwxwwxxx/ghc,holzensp/ghc,ryantm/ghc,sdiehl/ghc,ezyang/ghc,frantisekfarka/ghc-dsi,urbanslug/ghc,jstolarek/ghc,da-x/ghc,oldmanmike/ghc,shlevy/ghc,bitemyapp/ghc,sdiehl/ghc,elieux/ghc,ekmett/ghc,sgillespie/ghc,spacekitteh/smcghc,ryantm/ghc,shlevy/ghc,frantisekfarka/ghc-dsi,gcampax/ghc,forked-upstream-packages-for-ghcjs/ghc,bitemyapp/ghc,mcmaniac/ghc,vikraman/ghc,sdiehl/ghc,forked-upstream-packages-for-ghcjs/ghc,tjakway/ghcjvm,mfine/ghc,nkaretnikov/ghc,urbanslug/ghc,spacekitteh/smcghc,forked-upstream-packages-for-ghcjs/ghc,AlexanderPankiv/ghc,urbanslug/ghc,nomeata/ghc,mcmaniac/ghc,hferreiro/replay,christiaanb/ghc,gcampax/ghc,gridaphobe/ghc,GaloisInc/halvm-ghc,siddhanathan/ghc,vikraman/ghc,GaloisInc/halvm-ghc,acowley/ghc,nomeata/ghc,ghc-android/ghc,vikraman/ghc,siddhanathan/ghc,lukexi/ghc-7.8-arm64,vTurbine/ghc,shlevy/ghc,olsner/ghc,snoyberg/ghc,ilyasergey/GHC-XAppFix,urbanslug/ghc,urbanslug/ghc,TomMD/ghc,acowley/ghc,oldmanmike/ghc,mfine/ghc,mettekou/ghc,tibbe/ghc,ezyang/ghc,nomeata/ghc,oldmanmike/ghc,oldmanmike/ghc,sdiehl/ghc,lukexi/ghc,nomeata/ghc,mettekou/ghc,gridaphobe/ghc,tjakway/ghcjvm,fmthoma/ghc,siddhanathan/ghc,vTurbine/ghc,sgillespie/ghc,elieux/ghc,GaloisInc/halvm-ghc,green-haskell/ghc,jstolarek/ghc,bitemyapp/ghc,nushio3/ghc,christiaanb/ghc,siddhanathan/ghc,gridaphobe/ghc,nathyong/microghc-ghc,acowley/ghc,ekmett/ghc,snoyberg/ghc,anton-dessiatov/ghc,sgillespie/ghc,nomeata/ghc,olsner/ghc,sgillespie/ghc,vTurbine/ghc,elieux/ghc,snoyberg/ghc,lukexi/ghc,bitemyapp/ghc,christiaanb/ghc,christiaanb/ghc,vikraman/ghc,forked-upstream-packages-for-ghcjs/ghc,nathyong/microghc-ghc,mettekou/ghc,green-haskell/ghc,forked-upstream-packages-for-ghcjs/ghc,lukexi/ghc-7.8-arm64,mcschroeder/ghc,hferreiro/replay,fmthoma/ghc,nkaretnikov/ghc,mfine/ghc,acowley/ghc,ghc-android/ghc,ezyang/ghc,olsner/ghc,da-x/ghc,gcampax/ghc,fmthoma/ghc,gcampax/ghc,da-x/ghc,forked-upstream-packages-for-ghcjs/ghc,nkaretnikov/ghc,tjakway/ghcjvm,vikraman/ghc,shlevy/ghc,vTurbine/ghc,mettekou/ghc,ml9951/ghc,olsner/ghc