Fix bug where conflict view would have one too many context sections
Fix bug where conflict view would have one too many context sections

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