upgrading version of CodeMirror to 4.1.1, and fixing any merge-rot as a result.