Fixed no-conflict jQuery

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Mergely",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "homepage": "https://github.com/wickedest/Mergely",
   "description": "Merge and diff documents online",
   "main": [
@@ -29,7 +29,7 @@
     "url": "git://github.com/wickedest/Mergely"
   },
   "dependencies": {
-    "mergely": "https://github.com/wickedest/Mergely.git#3.4.2",
+    "mergely": "https://github.com/wickedest/Mergely.git#3.4.3",
     "jquery": "<=2.1.3",
     "codemirror": "<=5.11.0"
   }

lib/mergely.js

@@ -679,7 +679,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		}
 
 		// get current diff border color
-		var color = $('<div style="display:none" class="mergely current start" />').appendTo('body').css('border-top-color');
+		var color = jQuery('<div style="display:none" class="mergely current start" />').appendTo('body').css('border-top-color');
 		this.current_diff_color = color;
 
 		// codemirror
@@ -1351,8 +1351,8 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		});
 
 		// gutter markup
-		var lhsLineNumbers = $('#mergely-lhs ~ .CodeMirror').find('.CodeMirror-linenumber');
-		var rhsLineNumbers = $('#mergely-rhs ~ .CodeMirror').find('.CodeMirror-linenumber');
+		var lhsLineNumbers = jQuery('#mergely-lhs ~ .CodeMirror').find('.CodeMirror-linenumber');
+		var rhsLineNumbers = jQuery('#mergely-rhs ~ .CodeMirror').find('.CodeMirror-linenumber');
 		rhsLineNumbers.removeClass('mergely current');
 		lhsLineNumbers.removeClass('mergely current');
 		for (var i = 0; i < changes.length; ++i) {
@@ -1362,7 +1362,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 				for (j = jf; j < jt; j++) {
 					var n = (j + 1).toString();
 					rhsLineNumbers
-						.filter(function(i, node) { return $(node).text() === n; })
+						.filter(function(i, node) { return jQuery(node).text() === n; })
 					.addClass('mergely current');
 				}
 			}
@@ -1371,8 +1371,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 				jf = change['lhs-line-from'], jt = change['lhs-line-to'] + 1;
 				for (j = jf; j < jt; j++) {
 					var n = (j + 1).toString();
-					lhsLineNumbers
-						.filter(function(i, node) { return $(node).text() === n; })
+					lhsLineNumbers.filter(function(i, node) { return jQuery(node).text() === n; })
 					.addClass('mergely current');
 				}
 			}