diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 79bbf0b502c..c5779d01e7b 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -489,10 +489,13 @@ class StockReconciliation(StockController):
 
 		self.update_inventory_dimensions(row, data)
 
+<<<<<<< HEAD
 		if self.docstatus == 1 and has_dimensions and not row.batch_no:
 			data.qty_after_transaction = data.actual_qty
 			data.actual_qty = 0.0
 
+=======
+>>>>>>> 8ba66c9833 (Revert "fix: stock reco qty with inventory dimension (#47918)")
 		return data
 
 	def make_sle_on_cancel(self):