Merge branch 'fc/rerere-conflict-style' into maint