[editor] hightlight solve conflict changes on save  REVERTED FORMATTING
[editor] hightlight solve conflict changes on save  REVERTED FORMATTING

SQUASHED: editor-hightlight-solve-conflict-changes-on-save-REVERTED-FORMATTING,

LivelyKernel/lively4-core,LivelyKernel/lively4-core