Merge branch 'mm/conflict-advice'