Oh, also -- looks like a spurious CodeMirror SHA diff.  I think that's why the pull is showing a merge conflict.