[minor] fixed merge conflicts
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index a466446..a6b5b72 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.0.49'
+__version__ = '8.0.50'
def get_default_company(user=None):
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 8680fc1..738ed9e 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -402,3 +402,4 @@
erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
erpnext.patches.v8_0.delete_bin_indexes
erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
+erpnext.patches.v8_0.change_in_words_varchar_length
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/change_in_words_varchar_length.py b/erpnext/patches/v8_0/change_in_words_varchar_length.py
new file mode 100644
index 0000000..68ff95b
--- /dev/null
+++ b/erpnext/patches/v8_0/change_in_words_varchar_length.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ doctypes = frappe.db.sql_list("""select parent from tabDocField where fieldname = 'in_words'""")
+
+ for dt in doctypes:
+ for fieldname in ("in_words", "base_in_words"):
+ frappe.db.sql("alter table `tab{0}` change column `{1}` `{2}` varchar(255)"
+ .format(dt, fieldname, fieldname))
+
+ frappe.db.sql("""alter table `tabJournal Entry`
+ change column `total_amount_in_words` `total_amount_in_words` varchar(255)""")