new code mirror feature merge does not work without diff_match_patch