diff --git a/lib/mergely.js b/lib/mergely.js
index 38b5e74..e8c9c44 100644
--- a/lib/mergely.js
+++ b/lib/mergely.js
@@ -1287,53 +1287,53 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		this.trace('change', 'markup buttons time', timer.stop());
 	},
 	_merge_change :	function(change, side, oside) {
-			if (!change) return;
-			var led = this.editor[this.id+'-lhs'];
-			var red = this.editor[this.id+'-rhs'];
-			var ed = {lhs:led, rhs:red};
+		if (!change) return;
+		var led = this.editor[this.id+'-lhs'];
+		var red = this.editor[this.id+'-rhs'];
+		var ed = {lhs:led, rhs:red};
 
-	
-			var text = ed[side].getRange(
-				CodeMirror.Pos(change[side + '-line-from'], 0),
-				CodeMirror.Pos(change[side + '-line-to'] + 1, 0));
-			
-			if (change['op'] == 'c') {
+
+		var text = ed[side].getRange(
+			CodeMirror.Pos(change[side + '-line-from'], 0),
+			CodeMirror.Pos(change[side + '-line-to'] + 1, 0));
+		
+		if (change['op'] == 'c') {
+			ed[oside].replaceRange(text,
+				CodeMirror.Pos(change[oside + '-line-from'], 0),
+				CodeMirror.Pos(change[oside + '-line-to'] + 1, 0));
+		}
+		else if (side == 'rhs') {
+			if (change['op'] == 'a') {
 				ed[oside].replaceRange(text,
-					CodeMirror.Pos(change[oside + '-line-from'], 0),
+					CodeMirror.Pos(change[oside + '-line-from'] + 1, 0),
 					CodeMirror.Pos(change[oside + '-line-to'] + 1, 0));
 			}
-			else if (side == 'rhs') {
-				if (change['op'] == 'a') {
-					ed[oside].replaceRange(text,
-						CodeMirror.Pos(change[oside + '-line-from'] + 1, 0),
-						CodeMirror.Pos(change[oside + '-line-to'] + 1, 0));
-				}
-				else {// 'd'
-					var from = parseInt(change[oside + '-line-from']);
-					var to = parseInt(change[oside + '-line-to']);
-					for (var i = to; i >= from; --i) {
-						ed[oside].removeLine(i);
-					}
+			else {// 'd'
+				var from = parseInt(change[oside + '-line-from']);
+				var to = parseInt(change[oside + '-line-to']);
+				for (var i = to; i >= from; --i) {
+					ed[oside].removeLine(i);
 				}
 			}
-			else if (side == 'lhs') {
-				if (change['op'] == 'a') {
-					var from = parseInt(change[oside + '-line-from']);
-					var to = parseInt(change[oside + '-line-to']);
-					for (var i = to; i >= from; --i) {
-						ed[oside].removeLine(i);
-					}
-				}
-				else {// 'd'
-					ed[oside].replaceRange( text,
-						CodeMirror.Pos(change[oside + '-line-from'] + 1, 0));
+		}
+		else if (side == 'lhs') {
+			if (change['op'] == 'a') {
+				var from = parseInt(change[oside + '-line-from']);
+				var to = parseInt(change[oside + '-line-to']);
+				for (var i = to; i >= from; --i) {
+					ed[oside].removeLine(i);
 				}
 			}
-			//reset
-			ed['lhs'].setValue(ed['lhs'].getValue());
-			ed['rhs'].setValue(ed['rhs'].getValue());
+			else {// 'd'
+				ed[oside].replaceRange( text,
+					CodeMirror.Pos(change[oside + '-line-from'] + 1, 0));
+			}
+		}
+		//reset
+		ed['lhs'].setValue(ed['lhs'].getValue());
+		ed['rhs'].setValue(ed['rhs'].getValue());
 
-			this._scroll_to_change(change)
+		this._scroll_to_change(change)
 	},
 	_draw_info: function(editor_name1, editor_name2) {
 		var visible_page_height = jQuery(this.editor[editor_name1].getScrollerElement()).height();