Fixing Winter's merge conflicts