Merge branch 'tg/conflict-marker-size' into maint