new codemirror version
merge