Fix a lingering conflict.
Fix a lingering conflict.

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