Merge "Fix a bug in marking edits."