Correctly determine MR diff base when MR has merge conflicts

Merge request reports

Loading