diff --git a/index.html b/index.html
index 25f47d6..31dce3c 100644
--- a/index.html
+++ b/index.html
@@ -3,6 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
+<<<<<<< HEAD
 	<script type="text/javascript">window._version_number="102";
 
 /*
@@ -89,6 +90,9 @@
 /*
 *	lib/js/wn/provide.js
 */
+=======
+	<script type="text/javascript">window._version_number="51"
+>>>>>>> master
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}