[annotations] plan for dealing with merge conflicts
[annotations] plan for dealing with merge conflicts

SQUASHED: AUTO-COMMIT-demos-annotations-mergeconflicts.md,

LivelyKernel/lively4-core,LivelyKernel/lively4-core