try to fix conflicts
try to fix conflicts

CegepVictoriaville/linguist,tschf/linguist,JJ/linguist,nburkley/linguist,kyoungrok0517/linguist,MahmoudFayed/linguist,pcantrell/linguist,chiranjeevjain/linguist,osorgin/linguist,jtbandes/linguist,github/linguist,SRI-CSL/linguist,erkyrath/linguist,github/linguist,mwpastore/linguist,sebgod/linguist,erkyrath/linguist,jtbandes/linguist,a0viedo/linguist,CoderXpert/linguist,JJ/linguist,MahmoudFayed/linguist,yscho/linguist,assimovt/ling-ist,meunierfrederic/octocatlinguist,pchaigno/linguist,c-lipka/linguist,cokeboL/linguist,stanhu/linguist,manveru/linguist,jrnold/linguist,CoderXpert/linguist,ilyes14/linguist,pcantrell/linguist,BerkeleyTrue/linguist,erkyrath/linguist,FStarLang/linguist,cybernet14/linguist,cokeboL/linguist,yyx990803/linguist,yyx990803/linguist,chiranjeevjain/linguist,github/linguist,sagar290/linguist,jjatria/linguist,JJ/linguist,pchaigno/linguist,JJ/linguist,alitalia/linguist,CegepVictoriaville/linguist,whitj00/linguist,ammaraskar/linguist,Mx7f/linguist,yyx990803/linguist,ppaulweber/github-linguist,ya7lelkom/linguist,mattn/linguist,hcutler/linguist,BerkeleyTrue/linguist,douglas-larocca/linguist,phpsgi/linguist,nburkley/linguist,hcatlin/linguist,steventhanna/linguist,tschf/linguist,mwpastore/linguist,sebgod/linguist,R4PaSs/linguist,christop/linguist,whitj00/linguist,R4PaSs/linguist,stanhu/linguist,meunierfrederic/octocatlinguist,bluebear94/linguist,stanhu/linguist,SRI-CSL/linguist,kyoungrok0517/linguist,alitalia/linguist,ilyes14/linguist,davidzchen/linguist,FStarLang/linguist,assimovt/ling-ist,erkyrath/linguist,a0viedo/linguist,ya7lelkom/linguist,stanhu/linguist,jjatria/linguist,seanders/linguist,MadcapJake/linguist,jrnold/linguist,manveru/linguist,hcatlin/linguist,mattn/linguist,adamkaplan/linguist,MostAwesomeDude/linguist,iblech/linguist,georgesuperman/linguist,yscho/linguist,github/linguist,MadcapJake/linguist,christop/linguist,georgesuperman/linguist,ammaraskar/linguist,sebgod/linguist,meunierfrederic/octocatlinguist,scttnlsn/linguist,yyx990803/linguist,sebgod/linguist,MostAwesomeDude/linguist,hcutler/linguist,phpsgi/linguist,douglas-larocca/linguist,cybernet14/linguist,steventhanna/linguist,ppaulweber/github-linguist,bluebear94/linguist,osorgin/linguist,iblech/linguist,matt40k/linguist,PsichiX/linguist,kr/linguist,sagar290/linguist,Mx7f/linguist,thejameskyle/linguist,scttnlsn/linguist,pchaigno/linguist,c-lipka/linguist,thejameskyle/linguist,adamkaplan/linguist,matt40k/linguist,kr/linguist,martynbm/linguist,PsichiX/linguist,seanders/linguist,davidzchen/linguist,martynbm/linguist,pchaigno/linguist