feat: preserve ocd value ids

src/editor/dataset/constant/Element.ts

@@ -39,6 +39,7 @@ export const EDITOR_ELEMENT_COPY_ATTR: Array<keyof IElement> = [
 ]
 
 export const EDITOR_ELEMENT_ZIP_ATTR: Array<keyof IElement> = [
+  'id',
   'type',
   'font',
   'size',

src/utils/ocd.ts

@@ -3,7 +3,7 @@ import { IEditorData } from '../editor'
 
 const CONFLICT_MARKER_HIGHLIGHT = '#fff3cd'
 const CONFLICT_MARKER_COLOR = '#b42318'
-const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>)\b/
+const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>).*/
 
 type UnknownRecord = Record<string, unknown>