resolve merge conflict
resolve merge conflict

htve/GitlabForChinese,screenpages/gitlabhq,stoplightio/gitlabhq,daiyu/gitlab-zh,htve/GitlabForChinese,htve/GitlabForChinese,iiet/iiet-git,LUMC/gitlabhq,LUMC/gitlabhq,mmkassem/gitlabhq,mmkassem/gitlabhq,screenpages/gitlabhq,t-zuehlsdorff/gitlabhq,dwrensha/gitlabhq,Soullivaneuh/gitlabhq,icedwater/gitlabhq,t-zuehlsdorff/gitlabhq,openwide-java/gitlabhq,jirutka/gitlabhq,darkrasid/gitlabhq,LUMC/gitlabhq,openwide-java/gitlabhq,icedwater/gitlabhq,axilleas/gitlabhq,dplarson/gitlabhq,SVArago/gitlabhq,larryli/gitlabhq,martijnvermaat/gitlabhq,Soullivaneuh/gitlabhq,mmkassem/gitlabhq,daiyu/gitlab-zh,larryli/gitlabhq,jirutka/gitlabhq,LUMC/gitlabhq,shinexiao/gitlabhq,stoplightio/gitlabhq,SVArago/gitlabhq,allysonbarros/gitlabhq,icedwater/gitlabhq,t-zuehlsdorff/gitlabhq,dwrensha/gitlabhq,dwrensha/gitlabhq,dplarson/gitlabhq,openwide-java/gitlabhq,darkrasid/gitlabhq,Soullivaneuh/gitlabhq,iiet/iiet-git,dreampet/gitlab,stoplightio/gitlabhq,daiyu/gitlab-zh,SVArago/gitlabhq,screenpages/gitlabhq,martijnvermaat/gitlabhq,martijnvermaat/gitlabhq,mr-dxdy/gitlabhq,mmkassem/gitlabhq,dplarson/gitlabhq,jirutka/gitlabhq,iiet/iiet-git,daiyu/gitlab-zh,axilleas/gitlabhq,shinexiao/gitlabhq,dplarson/gitlabhq,icedwater/gitlabhq,larryli/gitlabhq,jirutka/gitlabhq,Soullivaneuh/gitlabhq,martijnvermaat/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,darkrasid/gitlabhq,iiet/iiet-git,allysonbarros/gitlabhq,allysonbarros/gitlabhq,mr-dxdy/gitlabhq,dwrensha/gitlabhq,axilleas/gitlabhq,dreampet/gitlab,darkrasid/gitlabhq,shinexiao/gitlabhq,openwide-java/gitlabhq,allysonbarros/gitlabhq,larryli/gitlabhq,SVArago/gitlabhq,t-zuehlsdorff/gitlabhq,mr-dxdy/gitlabhq,dreampet/gitlab,mr-dxdy/gitlabhq,axilleas/gitlabhq,screenpages/gitlabhq,shinexiao/gitlabhq,htve/GitlabForChinese