fix(cram): allow text after conflict markers#12655

Alizter merged 1 commit intoocaml:mainocaml/dune:mainfrom

Alizter:push-nnyvstvrsltvAlizter/dune:push-nnyvstvrsltvCopy head branch name to clipboard