Added new Conflicts tab and conflicts placeholder to MRs page.
Added new Conflicts tab and conflicts placeholder to MRs page.

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