Somehow some merge garbage got into the repo. Removing so `buck test --all` works again.
Somehow some merge garbage got into the repo.
Removing so `buck test --all` works again.

This appears to have been introduced in:
https://github.com/facebook/buck/commit/e793ed7f2eb0803231264327cf29ca57756d12bd

dushmis/buck,mikekap/buck,Heart2009/buck,SeleniumHQ/buck,mogers/buck,mogers/buck,nguyentruongtho/buck,Dominator008/buck,Distrotech/buck,ilya-klyuchnikov/buck,justinmuller/buck,vschs007/buck,romanoid/buck,mogers/buck,shs96c/buck,LegNeato/buck,dsyang/buck,liuyang-li/buck,clonetwin26/buck,belomx/open_tools,justinmuller/buck,daedric/buck,k21/buck,nguyentruongtho/buck,SeleniumHQ/buck,justinmuller/buck,SeleniumHQ/buck,pwz3n0/buck,zhuxiaohao/buck,liuyang-li/buck,shybovycha/buck,pwz3n0/buck,illicitonion/buck,darkforestzero/buck,neonichu/buck,SeleniumHQ/buck,hgl888/buck,shs96c/buck,zhan-xiong/buck,robbertvanginkel/buck,illicitonion/buck,nguyentruongtho/buck,JoelMarcey/buck,MarkRunWu/buck,dpursehouse/buck,rowillia/buck,Dominator008/buck,facebook/buck,mread/buck,raviagarwal7/buck,JoelMarcey/buck,OkBuilds/buck,rmaz/buck,mikekap/buck,thinkernel/buck,vschs007/buck,zhuxiaohao/buck,darkforestzero/buck,darkforestzero/buck,mikekap/buck,janicduplessis/buck,lukw00/buck,mogers/buck,mikekap/buck,SeleniumHQ/buck,neonichu/buck,Learn-Android-app/buck,rhencke/buck,romanoid/buck,1yvT0s/buck,Dominator008/buck,sdwilsh/buck,robbertvanginkel/buck,dushmis/buck,ilya-klyuchnikov/buck,pwz3n0/buck,artiya4u/buck,mikekap/buck,brettwooldridge/buck,Addepar/buck,dushmis/buck,k21/buck,hgl888/buck,stuhood/buck,liuyang-li/buck,sdwilsh/buck,MarkRunWu/buck,davido/buck,Heart2009/buck,lukw00/buck,marcinkwiatkowski/buck,rmaz/buck,k21/buck,zhan-xiong/buck,pwz3n0/buck,darkforestzero/buck,dushmis/buck,zhan-xiong/buck,stuhood/buck,nguyentruongtho/buck,bocon13/buck,artiya4u/buck,romanoid/buck,grumpyjames/buck,mikekap/buck,robbertvanginkel/buck,pwz3n0/buck,zpao/buck,ilya-klyuchnikov/buck,Dominator008/buck,siddhartharay007/buck,jackminicloud/buck,belomx/open_tools,hgl888/buck,Addepar/buck,Distrotech/buck,OkBuilds/buck,dsyang/buck,vschs007/buck,stuhood/buck,stuhood/buck,Distrotech/buck,Heart2009/buck,marcinkwiatkowski/buck,grumpyjames/buck,jackminicloud/buck,darkforestzero/buck,daedric/buck,rhencke/buck,LegNeato/buck,stuhood/buck,Learn-Android-app/buck,nguyentruongtho/buck,Heart2009/buck,raviagarwal7/buck,liuyang-li/buck,Heart2009/buck,Distrotech/buck,shs96c/buck,denizt/buck,SeleniumHQ/buck,neonichu/buck,dsyang/buck,neonichu/buck,clonetwin26/buck,dsyang/buck,brettwooldridge/buck,OkBuilds/buck,1yvT0s/buck,romanoid/buck,rowillia/buck,MarkRunWu/buck,JoelMarcey/buck,brettwooldridge/buck,k21/buck,k21/buck,rhencke/buck,davido/buck,k21/buck,brettwooldridge/buck,marcinkwiatkowski/buck,1yvT0s/buck,OkBuilds/buck,luiseduardohdbackup/buck,SeleniumHQ/buck,zhan-xiong/buck,k21/buck,thinkernel/buck,vine/buck,illicitonion/buck,zpao/buck,rmaz/buck,GerritCodeReview/buck,pwz3n0/buck,rhencke/buck,neonichu/buck,brettwooldridge/buck,LegNeato/buck,mogers/buck,artiya4u/buck,mikekap/buck,hgl888/buck,romanoid/buck,LegNeato/buck,ilya-klyuchnikov/buck,mnuessler/buck,luiseduardohdbackup/buck,dsyang/buck,daedric/buck,illicitonion/buck,shybovycha/buck,shs96c/buck,sdwilsh/buck,Dominator008/buck,JoelMarcey/buck,illicitonion/buck,Heart2009/buck,shybovycha/buck,vschs007/buck,shybovycha/buck,romanoid/buck,kageiit/buck,brettwooldridge/buck,OkBuilds/buck,clonetwin26/buck,marcinkwiatkowski/buck,bocon13/buck,hgl888/buck,daedric/buck,kageiit/buck,sdwilsh/buck,daedric/buck,robbertvanginkel/buck,Dominator008/buck,sdwilsh/buck,justinmuller/buck,bocon13/buck,Distrotech/buck,kageiit/buck,nguyentruongtho/buck,romanoid/buck,marcinkwiatkowski/buck,SeleniumHQ/buck,kageiit/buck,bocon13/buck,raviagarwal7/buck,dsyang/buck,LegNeato/buck,marcinkwiatkowski/buck,vschs007/buck,grumpyjames/buck,clonetwin26/buck,MarkRunWu/buck,marcinkwiatkowski/buck,neonichu/buck,JoelMarcey/buck,robbertvanginkel/buck,romanoid/buck,artiya4u/buck,davido/buck,daedric/buck,mnuessler/buck,mread/buck,illicitonion/buck,shybovycha/buck,raviagarwal7/buck,dsyang/buck,Dominator008/buck,darkforestzero/buck,saleeh93/buck-cutom,rmaz/buck,vine/buck,janicduplessis/buck,liuyang-li/buck,ilya-klyuchnikov/buck,rhencke/buck,robbertvanginkel/buck,siddhartharay007/buck,shs96c/buck,shs96c/buck,mread/buck,Addepar/buck,Distrotech/buck,Learn-Android-app/buck,grumpyjames/buck,sdwilsh/buck,LegNeato/buck,robbertvanginkel/buck,lukw00/buck,mogers/buck,davido/buck,GerritCodeReview/buck,brettwooldridge/buck,clonetwin26/buck,k21/buck,lukw00/buck,rhencke/buck,daedric/buck,OkBuilds/buck,dpursehouse/buck,ilya-klyuchnikov/buck,vschs007/buck,shs96c/buck,bocon13/buck,Learn-Android-app/buck,saleeh93/buck-cutom,mikekap/buck,illicitonion/buck,JoelMarcey/buck,Distrotech/buck,artiya4u/buck,1yvT0s/buck,ilya-klyuchnikov/buck,tgummerer/buck,zhuxiaohao/buck,Distrotech/buck,denizt/buck,Dominator008/buck,stuhood/buck,lukw00/buck,clonetwin26/buck,ilya-klyuchnikov/buck,zhan-xiong/buck,Learn-Android-app/buck,vine/buck,SeleniumHQ/buck,Addepar/buck,janicduplessis/buck,Learn-Android-app/buck,grumpyjames/buck,mogers/buck,Addepar/buck,SeleniumHQ/buck,siddhartharay007/buck,JoelMarcey/buck,belomx/open_tools,rowillia/buck,bocon13/buck,clonetwin26/buck,robbertvanginkel/buck,justinmuller/buck,facebook/buck,Heart2009/buck,k21/buck,dsyang/buck,brettwooldridge/buck,rowillia/buck,marcinkwiatkowski/buck,luiseduardohdbackup/buck,rowillia/buck,JoelMarcey/buck,rhencke/buck,bocon13/buck,tgummerer/buck,robbertvanginkel/buck,dushmis/buck,mnuessler/buck,bocon13/buck,grumpyjames/buck,nguyentruongtho/buck,rowillia/buck,GerritCodeReview/buck,shs96c/buck,grumpyjames/buck,Dominator008/buck,janicduplessis/buck,tgummerer/buck,raviagarwal7/buck,brettwooldridge/buck,robbertvanginkel/buck,zhan-xiong/buck,shybovycha/buck,siddhartharay007/buck,luiseduardohdbackup/buck,OkBuilds/buck,Learn-Android-app/buck,davido/buck,shybovycha/buck,JoelMarcey/buck,clonetwin26/buck,tgummerer/buck,lukw00/buck,tgummerer/buck,illicitonion/buck,dsyang/buck,shs96c/buck,SeleniumHQ/buck,hgl888/buck,darkforestzero/buck,artiya4u/buck,mogers/buck,justinmuller/buck,LegNeato/buck,zhuxiaohao/buck,Addepar/buck,liuyang-li/buck,Distrotech/buck,mread/buck,liuyang-li/buck,romanoid/buck,rmaz/buck,daedric/buck,Heart2009/buck,OkBuilds/buck,mread/buck,LegNeato/buck,darkforestzero/buck,MarkRunWu/buck,justinmuller/buck,Dominator008/buck,artiya4u/buck,k21/buck,Distrotech/buck,saleeh93/buck-cutom,grumpyjames/buck,ilya-klyuchnikov/buck,romanoid/buck,grumpyjames/buck,pwz3n0/buck,vschs007/buck,zpao/buck,Heart2009/buck,raviagarwal7/buck,saleeh93/buck-cutom,vine/buck,tgummerer/buck,grumpyjames/buck,MarkRunWu/buck,zhan-xiong/buck,liuyang-li/buck,davido/buck,romanoid/buck,zhan-xiong/buck,marcinkwiatkowski/buck,k21/buck,davido/buck,stuhood/buck,zhan-xiong/buck,bocon13/buck,MarkRunWu/buck,rhencke/buck,janicduplessis/buck,mogers/buck,vine/buck,ilya-klyuchnikov/buck,sdwilsh/buck,hgl888/buck,raviagarwal7/buck,daedric/buck,brettwooldridge/buck,janicduplessis/buck,zhan-xiong/buck,daedric/buck,raviagarwal7/buck,mogers/buck,OkBuilds/buck,justinmuller/buck,siddhartharay007/buck,raviagarwal7/buck,OkBuilds/buck,dsyang/buck,SeleniumHQ/buck,denizt/buck,rowillia/buck,liuyang-li/buck,rmaz/buck,grumpyjames/buck,dpursehouse/buck,daedric/buck,justinmuller/buck,1yvT0s/buck,sdwilsh/buck,siddhartharay007/buck,zhuxiaohao/buck,kageiit/buck,vine/buck,rhencke/buck,Distrotech/buck,vine/buck,tgummerer/buck,bocon13/buck,sdwilsh/buck,mnuessler/buck,JoelMarcey/buck,thinkernel/buck,rhencke/buck,rmaz/buck,shs96c/buck,rmaz/buck,sdwilsh/buck,facebook/buck,1yvT0s/buck,illicitonion/buck,Dominator008/buck,grumpyjames/buck,janicduplessis/buck,rowillia/buck,vschs007/buck,rowillia/buck,janicduplessis/buck,rhencke/buck,clonetwin26/buck,vine/buck,shs96c/buck,zpao/buck,illicitonion/buck,brettwooldridge/buck,vschs007/buck,stuhood/buck,dushmis/buck,darkforestzero/buck,robbertvanginkel/buck,illicitonion/buck,rmaz/buck,Addepar/buck,facebook/buck,dpursehouse/buck,facebook/buck,lukw00/buck,sdwilsh/buck,siddhartharay007/buck,daedric/buck,shybovycha/buck,pwz3n0/buck,vine/buck,MarkRunWu/buck,zhan-xiong/buck,marcinkwiatkowski/buck,shybovycha/buck,zpao/buck,neonichu/buck,Learn-Android-app/buck,Addepar/buck,shybovycha/buck,vschs007/buck,clonetwin26/buck,zhuxiaohao/buck,rowillia/buck,romanoid/buck,lukw00/buck,ilya-klyuchnikov/buck,dpursehouse/buck,darkforestzero/buck,illicitonion/buck,mikekap/buck,davido/buck,zhuxiaohao/buck,tgummerer/buck,artiya4u/buck,robbertvanginkel/buck,saleeh93/buck-cutom,JoelMarcey/buck,ilya-klyuchnikov/buck,darkforestzero/buck,liuyang-li/buck,dpursehouse/buck,shs96c/buck,dpursehouse/buck,janicduplessis/buck,justinmuller/buck,LegNeato/buck,rmaz/buck,dsyang/buck,bocon13/buck,Addepar/buck,marcinkwiatkowski/buck,neonichu/buck,raviagarwal7/buck,denizt/buck,davido/buck,janicduplessis/buck,shybovycha/buck,darkforestzero/buck,artiya4u/buck,luiseduardohdbackup/buck,Addepar/buck,Learn-Android-app/buck,1yvT0s/buck,sdwilsh/buck,artiya4u/buck,luiseduardohdbackup/buck,pwz3n0/buck,luiseduardohdbackup/buck,LegNeato/buck,hgl888/buck,zpao/buck,Addepar/buck,robbertvanginkel/buck,k21/buck,Addepar/buck,dsyang/buck,luiseduardohdbackup/buck,facebook/buck,davido/buck,brettwooldridge/buck,zpao/buck,OkBuilds/buck,stuhood/buck,darkforestzero/buck,pwz3n0/buck,dushmis/buck,brettwooldridge/buck,Learn-Android-app/buck,kageiit/buck,clonetwin26/buck,LegNeato/buck,janicduplessis/buck,jackminicloud/buck,SeleniumHQ/buck,kageiit/buck,clonetwin26/buck,justinmuller/buck,siddhartharay007/buck,ilya-klyuchnikov/buck,mnuessler/buck,shybovycha/buck,raviagarwal7/buck,davido/buck,denizt/buck,rmaz/buck,Learn-Android-app/buck,lukw00/buck,marcinkwiatkowski/buck,dushmis/buck,mnuessler/buck,shs96c/buck,justinmuller/buck,rowillia/buck,romanoid/buck,justinmuller/buck,siddhartharay007/buck,LegNeato/buck,marcinkwiatkowski/buck,zhuxiaohao/buck,vschs007/buck,stuhood/buck,GerritCodeReview/buck,mnuessler/buck,JoelMarcey/buck,rmaz/buck,pwz3n0/buck,raviagarwal7/buck,JoelMarcey/buck,OkBuilds/buck,dushmis/buck,davido/buck,stuhood/buck,Addepar/buck,zhuxiaohao/buck,shybovycha/buck,vine/buck,dsyang/buck,1yvT0s/buck,sdwilsh/buck,saleeh93/buck-cutom,belomx/open_tools,zhan-xiong/buck,tgummerer/buck,OkBuilds/buck,davido/buck,1yvT0s/buck,jackminicloud/buck,dushmis/buck,zhan-xiong/buck,hgl888/buck,mread/buck,LegNeato/buck,bocon13/buck,daedric/buck,mnuessler/buck,janicduplessis/buck,vschs007/buck,clonetwin26/buck,raviagarwal7/buck,mogers/buck,artiya4u/buck,k21/buck,rowillia/buck,luiseduardohdbackup/buck,facebook/buck,Dominator008/buck,mikekap/buck,mnuessler/buck,tgummerer/buck,neonichu/buck,lukw00/buck,illicitonion/buck,tgummerer/buck,rmaz/buck,thinkernel/buck,mikekap/buck,vine/buck,vschs007/buck,lukw00/buck,liuyang-li/buck,mikekap/buck,dpursehouse/buck