Fix webpack config conflicts bad resolution
Fix webpack config conflicts bad resolution

dplarson/gitlabhq,htve/GitlabForChinese,iiet/iiet-git,stoplightio/gitlabhq,iiet/iiet-git,htve/GitlabForChinese,dreampet/gitlab,iiet/iiet-git,stoplightio/gitlabhq,t-zuehlsdorff/gitlabhq,dreampet/gitlab,jirutka/gitlabhq,t-zuehlsdorff/gitlabhq,htve/GitlabForChinese,dplarson/gitlabhq,axilleas/gitlabhq,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,jirutka/gitlabhq,dreampet/gitlab,mmkassem/gitlabhq,mmkassem/gitlabhq,jirutka/gitlabhq,axilleas/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,dreampet/gitlab,mmkassem/gitlabhq,dplarson/gitlabhq,htve/GitlabForChinese,stoplightio/gitlabhq,dplarson/gitlabhq,t-zuehlsdorff/gitlabhq,mmkassem/gitlabhq,jirutka/gitlabhq,iiet/iiet-git