diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index ffa441aa74f..caea353502e 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -21,11 +21,12 @@ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 from erpnext.stock.stock_ledger import is_negative_stock_allowed
 
 
-<<<<<<< HEAD
+
 class PartialPaymentValidationError(frappe.ValidationError):
-=======
+	pass
+
+
 class ProductBundleStockValidationError(frappe.ValidationError):
->>>>>>> 2612152456 (test(pos): add test for product bundle negative stock validation)
 	pass