Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'