Fix conflict issue
Fix conflict issue

Signed-off-by: Dmitriy Zaporozhets <be23d75b156792e5acab51b196a2deb155d35d6a@gmail.com>

koreamic/gitlabhq,openwide-java/gitlabhq,gopeter/gitlabhq,SVArago/gitlabhq,mmkassem/gitlabhq,ferdinandrosario/gitlabhq,htve/GitlabForChinese,sekcheong/gitlabhq,ttasanen/gitlabhq,ordiychen/gitlabhq,jrjang/gitlab-ce,michaKFromParis/sparkslab,stanhu/gitlabhq,TheWatcher/gitlabhq,shinexiao/gitlabhq,michaKFromParis/gitlabhqold,dreampet/gitlab,Razer6/gitlabhq,martijnvermaat/gitlabhq,darkrasid/gitlabhq,mr-dxdy/gitlabhq,sonalkr132/gitlabhq,screenpages/gitlabhq,sue445/gitlabhq,mrb/gitlabhq,stoplightio/gitlabhq,Devin001/gitlabhq,folpindo/gitlabhq,nmav/gitlabhq,stanhu/gitlabhq,NKMR6194/gitlabhq,joalmeid/gitlabhq,pjknkda/gitlabhq,TheWatcher/gitlabhq,iiet/iiet-git,sue445/gitlabhq,szechyjs/gitlabhq,theonlydoo/gitlabhq,openwide-java/gitlabhq,jirutka/gitlabhq,Soullivaneuh/gitlabhq,allysonbarros/gitlabhq,michaKFromParis/gitlabhq,daiyu/gitlab-zh,michaKFromParis/gitlabhqold,k4zzk/gitlabhq,bozaro/gitlabhq,sekcheong/gitlabhq,axilleas/gitlabhq,fantasywind/gitlabhq,since2014/gitlabhq,duduribeiro/gitlabhq,H3Chief/gitlabhq,fpgentil/gitlabhq,Telekom-PD/gitlabhq,michaKFromParis/gitlabhqold,LUMC/gitlabhq,it33/gitlabhq,rebecamendez/gitlabhq,cui-liqiang/gitlab-ce,jaepyoung/gitlabhq,chenrui2014/gitlabhq,Telekom-PD/gitlabhq,DanielZhangQingLong/gitlabhq,Soullivaneuh/gitlabhq,MauriceMohlek/gitlabhq,fgbreel/gitlabhq,Tyrael/gitlabhq,dplarson/gitlabhq,dwrensha/gitlabhq,duduribeiro/gitlabhq,yatish27/gitlabhq,theonlydoo/gitlabhq,fpgentil/gitlabhq,OtkurBiz/gitlabhq,ksoichiro/gitlabhq,fscherwi/gitlabhq,axilleas/gitlabhq,SVArago/gitlabhq,htve/GitlabForChinese,H3Chief/gitlabhq,htve/GitlabForChinese,ttasanen/gitlabhq,ttasanen/gitlabhq,nguyen-tien-mulodo/gitlabhq,michaKFromParis/sparkslab,martinma4/gitlabhq,iiet/iiet-git,nguyen-tien-mulodo/gitlabhq,michaKFromParis/gitlabhq,mr-dxdy/gitlabhq,iiet/iiet-git,michaKFromParis/sparkslab,iiet/iiet-git,LUMC/gitlabhq,michaKFromParis/gitlabhqold,dreampet/gitlab,copystudy/gitlabhq,yonglehou/gitlabhq,wangcan2014/gitlabhq,mmkassem/gitlabhq,kemenaran/gitlabhq,Exeia/gitlabhq,DanielZhangQingLong/gitlabhq,martinma4/gitlabhq,louahola/gitlabhq,DanielZhangQingLong/gitlabhq,pulkit21/gitlabhq,kemenaran/gitlabhq,icedwater/gitlabhq,icedwater/gitlabhq,whluwit/gitlabhq,pulkit21/gitlabhq,ikappas/gitlabhq,rebecamendez/gitlabhq,fantasywind/gitlabhq,Datacom/gitlabhq,Tyrael/gitlabhq,H3Chief/gitlabhq,OtkurBiz/gitlabhq,bozaro/gitlabhq,bbodenmiller/gitlabhq,dreampet/gitlab,larryli/gitlabhq,szechyjs/gitlabhq,dukex/gitlabhq,daiyu/gitlab-zh,screenpages/gitlabhq,koreamic/gitlabhq,k4zzk/gitlabhq,yfaizal/gitlabhq,bbodenmiller/gitlabhq,cui-liqiang/gitlab-ce,axilleas/gitlabhq,mmkassem/gitlabhq,jrjang/gitlabhq,hacsoc/gitlabhq,ttasanen/gitlabhq,joalmeid/gitlabhq,TheWatcher/gitlabhq,ordiychen/gitlabhq,OlegGirko/gitlab-ce,Burick/gitlabhq,darkrasid/gitlabhq,Burick/gitlabhq,dplarson/gitlabhq,fpgentil/gitlabhq,vjustov/gitlabhq,MauriceMohlek/gitlabhq,joalmeid/gitlabhq,OlegGirko/gitlab-ce,tk23/gitlabhq,nmav/gitlabhq,Tyrael/gitlabhq,koreamic/gitlabhq,screenpages/gitlabhq,axilleas/gitlabhq,martijnvermaat/gitlabhq,SVArago/gitlabhq,NKMR6194/gitlabhq,folpindo/gitlabhq,allysonbarros/gitlabhq,Datacom/gitlabhq,sekcheong/gitlabhq,Datacom/gitlabhq,michaKFromParis/gitlabhq,since2014/gitlabhq,larryli/gitlabhq,fpgentil/gitlabhq,dwrensha/gitlabhq,aaronsnyder/gitlabhq,allistera/gitlabhq,sue445/gitlabhq,stoplightio/gitlabhq,shinexiao/gitlabhq,yonglehou/gitlabhq,pjknkda/gitlabhq,salipro4ever/gitlabhq,k4zzk/gitlabhq,liyakun/gitlabhq,LUMC/gitlabhq,openwide-java/gitlabhq,joalmeid/gitlabhq,aaronsnyder/gitlabhq,hzy001/gitlabhq,Devin001/gitlabhq,liyakun/gitlabhq,wangcan2014/gitlabhq,dplarson/gitlabhq,folpindo/gitlabhq,bbodenmiller/gitlabhq,yatish27/gitlabhq,DanielZhangQingLong/gitlabhq,allistera/gitlabhq,Razer6/gitlabhq,michaKFromParis/gitlabhq,Devin001/gitlabhq,aaronsnyder/gitlabhq,fscherwi/gitlabhq,folpindo/gitlabhq,louahola/gitlabhq,k4zzk/gitlabhq,htve/GitlabForChinese,yatish27/gitlabhq,yfaizal/gitlabhq,yfaizal/gitlabhq,delkyd/gitlabhq,H3Chief/gitlabhq,MauriceMohlek/gitlabhq,bozaro/gitlabhq,allysonbarros/gitlabhq,mr-dxdy/gitlabhq,OtkurBiz/gitlabhq,ordiychen/gitlabhq,MauriceMohlek/gitlabhq,salipro4ever/gitlabhq,ferdinandrosario/gitlabhq,chenrui2014/gitlabhq,it33/gitlabhq,hacsoc/gitlabhq,sonalkr132/gitlabhq,kemenaran/gitlabhq,gopeter/gitlabhq,jirutka/gitlabhq,jrjang/gitlab-ce,theonlydoo/gitlabhq,yonglehou/gitlabhq,tk23/gitlabhq,yatish27/gitlabhq,szechyjs/gitlabhq,allistera/gitlabhq,mrb/gitlabhq,t-zuehlsdorff/gitlabhq,jirutka/gitlabhq,since2014/gitlabhq,dwrensha/gitlabhq,larryli/gitlabhq,mrb/gitlabhq,daiyu/gitlab-zh,daiyu/gitlab-zh,fgbreel/gitlabhq,since2014/gitlabhq,dukex/gitlabhq,copystudy/gitlabhq,jaepyoung/gitlabhq,copystudy/gitlabhq,cui-liqiang/gitlab-ce,yonglehou/gitlabhq,icedwater/gitlabhq,WSDC-NITWarangal/gitlabhq,gopeter/gitlabhq,delkyd/gitlabhq,jrjang/gitlabhq,yfaizal/gitlabhq,nguyen-tien-mulodo/gitlabhq,OlegGirko/gitlab-ce,whluwit/gitlabhq,nmav/gitlabhq,mmkassem/gitlabhq,hzy001/gitlabhq,pulkit21/gitlabhq,martijnvermaat/gitlabhq,allistera/gitlabhq,martinma4/gitlabhq,rebecamendez/gitlabhq,Soullivaneuh/gitlabhq,Burick/gitlabhq,chenrui2014/gitlabhq,TheWatcher/gitlabhq,dreampet/gitlab,LUMC/gitlabhq,Soullivaneuh/gitlabhq,delkyd/gitlabhq,SVArago/gitlabhq,tk23/gitlabhq,pjknkda/gitlabhq,aaronsnyder/gitlabhq,WSDC-NITWarangal/gitlabhq,Exeia/gitlabhq,stanhu/gitlabhq,mr-dxdy/gitlabhq,NKMR6194/gitlabhq,pjknkda/gitlabhq,duduribeiro/gitlabhq,fgbreel/gitlabhq,Razer6/gitlabhq,martinma4/gitlabhq,Exeia/gitlabhq,it33/gitlabhq,louahola/gitlabhq,theonlydoo/gitlabhq,shinexiao/gitlabhq,sekcheong/gitlabhq,fgbreel/gitlabhq,kemenaran/gitlabhq,chenrui2014/gitlabhq,t-zuehlsdorff/gitlabhq,szechyjs/gitlabhq,gopeter/gitlabhq,jrjang/gitlab-ce,ferdinandrosario/gitlabhq,screenpages/gitlabhq,salipro4ever/gitlabhq,WSDC-NITWarangal/gitlabhq,Telekom-PD/gitlabhq,koreamic/gitlabhq,sonalkr132/gitlabhq,Burick/gitlabhq,t-zuehlsdorff/gitlabhq,dukex/gitlabhq,stanhu/gitlabhq,Tyrael/gitlabhq,OlegGirko/gitlab-ce,pulkit21/gitlabhq,fantasywind/gitlabhq,hzy001/gitlabhq,shinexiao/gitlabhq,louahola/gitlabhq,ksoichiro/gitlabhq,jaepyoung/gitlabhq,Telekom-PD/gitlabhq,sonalkr132/gitlabhq,Razer6/gitlabhq,openwide-java/gitlabhq,jrjang/gitlabhq,allysonbarros/gitlabhq,vjustov/gitlabhq,ferdinandrosario/gitlabhq,fantasywind/gitlabhq,vjustov/gitlabhq,ordiychen/gitlabhq,martijnvermaat/gitlabhq,michaKFromParis/sparkslab,Devin001/gitlabhq,fscherwi/gitlabhq,tk23/gitlabhq,whluwit/gitlabhq,ksoichiro/gitlabhq,whluwit/gitlabhq,hacsoc/gitlabhq,dwrensha/gitlabhq,salipro4ever/gitlabhq,nguyen-tien-mulodo/gitlabhq,stoplightio/gitlabhq,it33/gitlabhq,darkrasid/gitlabhq,mrb/gitlabhq,vjustov/gitlabhq,dplarson/gitlabhq,duduribeiro/gitlabhq,t-zuehlsdorff/gitlabhq,OtkurBiz/gitlabhq,sue445/gitlabhq,jirutka/gitlabhq,ikappas/gitlabhq,hzy001/gitlabhq,stoplightio/gitlabhq,fscherwi/gitlabhq,liyakun/gitlabhq,copystudy/gitlabhq,jrjang/gitlabhq,nmav/gitlabhq,larryli/gitlabhq,Datacom/gitlabhq,liyakun/gitlabhq,wangcan2014/gitlabhq,icedwater/gitlabhq,darkrasid/gitlabhq,hacsoc/gitlabhq,cui-liqiang/gitlab-ce,wangcan2014/gitlabhq,jrjang/gitlab-ce,rebecamendez/gitlabhq,delkyd/gitlabhq,bbodenmiller/gitlabhq,ikappas/gitlabhq,dukex/gitlabhq,NKMR6194/gitlabhq,ksoichiro/gitlabhq,WSDC-NITWarangal/gitlabhq,jaepyoung/gitlabhq,ikappas/gitlabhq,bozaro/gitlabhq,Exeia/gitlabhq