[960987] Reverted to slow set and check for mark.parent, and removed unused Codemirror merge styles