diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 368ad122..90828f71 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,6 +1,7 @@
 class Inventory::InventoryController < BaseInventoryController
   load_and_authorize_resource
   def index
+<<<<<<< HEAD
     least_stock = "SELECT (CASE WHEN SIGN(MIN(stock_journals.balance)) > 0
                   THEN MIN(stock_journals.balance) WHEN stock_journals.remark NOT LIKE '%out of stock%'
                                 THEN (SELECT balance FROM stock_journals
@@ -10,6 +11,15 @@ class Inventory::InventoryController < BaseInventoryController
                                       FROM stock_journals
                                         WHERE stock_journals.item_code = inventory_definitions.item_code
                                       ORDER BY stock_journals.created_at DESC"
+=======
+    least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock'
+                  THEN (SELECT balance FROM stock_journals
+                                  WHERE item_code = inventory_definitions.item_code
+                                      ORDER BY created_at DESC LIMIT 1) ELSE 0 END)
+                                      FROM stock_journals
+                                        WHERE stock_journals.item_code = inventory_definitions.item_code AND stock_journals.remark != 'out of stock'
+                                      ORDER BY stock_journals.created_at DESC LIMIT 1"
+>>>>>>> 49fd42722569262f77fc3bb0eed76195fd6cfe9d
 
     @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
    							(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,