Merge branch 'jc/conflict-marker-size' into next