draft12: Fix treatment of major_rank_conflicts when merging