v10.12.2
3a6910a1 · Merge branch 'conflict-notification' into 'main' ·