diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 434a56ace0a..7ab8533368f 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -297,11 +297,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 			let d = locals[cdt][cdn];
 			return {
 				filters: {
-<<<<<<< HEAD
-					docstatus: 1,
-=======
 					docstatus: ["<", 2],
->>>>>>> 0c1a8e9c58 (fix: incorrect condition)
 					inspection_type: inspection_type,
 					reference_name: doc.name,
 					item_code: d.item_code