diff --git a/examples/app.js b/examples/app.js
index ac84516..f699c5e 100644
--- a/examples/app.js
+++ b/examples/app.js
@@ -33,8 +33,8 @@ document.onreadystatechange = function () {
 		},
 		rhs: function(setValue) {
 			setValue(macbeth.join('\n')
-				.replace(/love/g, 'hate')
-				.replace(/heart/g, 'head'));
+				.replace(/serpent/g, 'pencil'));
+				//.replace(/heart/g, 'head'));
 		},
 		_debug: 'scroll,debug,event'
 		// _debug: 'draw,change,event'
diff --git a/src/diff-view.js b/src/diff-view.js
index 144ff5b..a7888d2 100644
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -45,7 +45,6 @@ Fixed performance issue with large sections of deleted/added text
 Fixed issue where initial render scrolled to first change, showing it at the bottom, as opposed to middle
 
 TODO:
-Fix issue with Macbeth changing serpent => pencil
 For some reason ignore-whitespace will mark the "red" differently
 Fix issue where characters like `{}[].?` are not detected by LCS
 Fix the popup
diff --git a/src/lcs.js b/src/lcs.js
index a8fa9b4..c3cc631 100644
--- a/src/lcs.js
+++ b/src/lcs.js
@@ -59,6 +59,7 @@ LCS.prototype.diff = function (added, removed) {
 		ignoreaccents: !!this.options.ignoreaccents
 	});
 	const changes = DiffParser(d.normal_form());
+	console.log(changes);
 	for (let i = 0; i < changes.length; ++i) {
 		const change = changes[i];
 		if (this.options.ignorews) {
diff --git a/src/vdoc.js b/src/vdoc.js
index 01d7829..abcce71 100644
--- a/src/vdoc.js
+++ b/src/vdoc.js
@@ -116,10 +116,12 @@ class VDoc {
 				// too many lines here. it's no more than the viewport.
 				lcs.diff(
 					function _added(from, to) {
+						console.log('added', {from, to});
 						const line = vdoc._getLine('rhs', k);
 						line.markText(from, to, 'mergely ch a rhs');
 					},
 					function _removed(from, to) {
+						console.log('removed', {from, to});
 						const line = vdoc._getLine('lhs', j);
 						line.markText(from, to, 'mergely ch d lhs');
 					}
@@ -177,6 +179,7 @@ class VLine {
 		this.marker = null;
 		this.editor = null;
 		this.markup = [];
+		this._clearMarkup = [];
 		this.rendered = false;
 	}
 
@@ -189,7 +192,7 @@ class VLine {
 	}
 
 	markText(charFrom, charTo, className) {
-		this.markup = [ charFrom, charTo, className ];
+		this.markup.push([ charFrom, charTo, className ]);
 	}
 
 	update(editor) {
@@ -212,17 +215,20 @@ class VLine {
 			item.addEventListener('click', handler);
 			editor.setGutterMarker(this.id, name, item);
 		}
-		if (this.markup) {
-			const [ charFrom, charTo, className ] = this.markup;
-			const fromPos = { line: this.id };
-			const toPos = { line: this.id };
-			if (charFrom >= 0) {
-				fromPos.ch = charFrom;
+		if (this.markup.length) {
+			for (const markup of this.markup) {
+				const [ charFrom, charTo, className ] = markup;
+				const fromPos = { line: this.id };
+				const toPos = { line: this.id };
+				if (charFrom >= 0) {
+					fromPos.ch = charFrom;
+				}
+				if (charTo >= 0) {
+					toPos.ch = charTo;
+				}
+				this._clearMarkup.push(
+					editor.markText(fromPos, toPos, { className }));
 			}
-			if (charTo >= 0) {
-				toPos.ch = charTo;
-			}
-			this._clearMarkup = editor.markText(fromPos, toPos, { className });
 		}
 		this.rendered = true;
 	}
@@ -233,7 +239,6 @@ class VLine {
 			return;
 		}
 
-		console.warn('clear editor', this.id);
 		if (this.background) {
 			editor.removeLineClass(this.id, 'background');
 		}
@@ -247,8 +252,12 @@ class VLine {
 			item.removeEventListener('click', handler);
 			item.remove();
 		}
-		if (this._clearMarkup) {
-			this._clearMarkup.clear();
+		if (this._clearMarkup.length) {
+			for (const markup of this._clearMarkup) {
+				markup.clear();
+			}
+			this._clearMarkup = [];
+			this.markup = [];
 		}
 	}
 }