RelNoteson commit Merge branch 'mm/conflict-advice' (71b3ef1)
   1Documentation/RelNotes-1.7.0.txt